100 files changed, 49555 insertions, 47587 deletions

diff --git a/Makefile.in b/Makefile.in
index 1144f29..6891d72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -551,10 +551,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -596,9 +602,10 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
diff --git a/NEWS b/NEWS
index 89da87f..38b0f8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,42 @@
+Overview of changes in simple-scan 3.12.0
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.11.92
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.11.91
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.11.5
+
+  * Only update gsettings when they change. Move application state from
+    gsettings to ~/.cache
+
+Overview of changes in simple-scan 3.11.4
+
+  * Use AppMenu in GNOME Shell
+
+Overview of changes in simple-scan 3.11.3
+
+  * Remove deprecated Gtk.Stock items and Gtk widgets (GtkVBox, GtkTable, GtkHButtonBox)
+  * Stop using sqlite package
+  * Update .ui file to work with recent Glade version
+
+Overview of changes in simple-scan 3.11.1.1
+
+  * Fix regression where quality and contrast can be reset to minimum
+  * Install missing help images
+  * Mark autosaved books as needs saving
+
+Overview of changes in simple-scan 3.11.1
+
+  * Fix page size not being applied on some drivers
+  * Rewrite autosaving. Now uses files for scan data, is more efficient in
+    writing to disk and drops dependency on sqlite.
+
 Overview of changes in simple-scan 3.10.0
 
   * Fix --fix-pdf not working due to attempting to treat binary data as UTF-8
diff --git a/aclocal.m4 b/aclocal.m4
index b075521..205cdaf 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -115,7 +115,7 @@ mostlyclean-am: clean-gsettings-schemas
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+	$(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
@@ -376,7 +376,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 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,
@@ -622,7 +622,8 @@ all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HEL
 .PHONY: pot
 pot: $(_HELP_POTFILE)
 $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES)
+	$(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)
@@ -775,10 +776,10 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.3], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -794,7 +795,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.3])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1161,6 +1162,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -1269,7 +1276,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -1277,7 +1325,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -1425,38 +1472,6 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
@@ -1527,6 +1542,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 69b3c43..30c81e2 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.10.0.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.12.0.
 #
 #
 # 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.10.0'
-PACKAGE_STRING='simple-scan 3.10.0'
+PACKAGE_VERSION='3.12.0'
+PACKAGE_STRING='simple-scan 3.12.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1396,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.10.0 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.12.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1462,7 +1462,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.10.0:";;
+     short | recursive ) echo "Configuration of simple-scan 3.12.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.10.0
+simple-scan configure 3.12.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1943,7 +1943,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.10.0, which was
+It was created by simple-scan $as_me 3.12.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2291,7 +2291,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2806,7 +2806,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.10.0'
+ VERSION='3.12.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2857,6 +2857,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
@@ -3856,6 +3897,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -3984,131 +4084,6 @@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 
 
@@ -4304,7 +4279,7 @@ mostlyclean-am: clean-gsettings-schemas
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+	$(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
@@ -4404,7 +4379,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
     glib-2.0 >= 2.32
@@ -4415,7 +4389,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -4429,7 +4402,6 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4451,7 +4423,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
     glib-2.0 >= 2.32
@@ -4462,7 +4433,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -4476,7 +4446,6 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4507,7 +4476,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 " 2>&1`
         else
 	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
@@ -4519,7 +4487,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -4534,7 +4501,6 @@ fi
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 ) were not met:
 
 $SIMPLE_SCAN_PKG_ERRORS
@@ -5232,7 +5198,8 @@ all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HEL
 .PHONY: pot
 pot: $(_HELP_POTFILE)
 $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES)
+	$(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)
@@ -6537,7 +6504,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.10.0, which was
+This file was extended by simple-scan $as_me 3.12.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6594,7 +6561,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.10.0
+simple-scan config.status 3.12.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index aa152be..aa1a2e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.10.0)
+AC_INIT(simple-scan, 3.12.0)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
@@ -29,7 +29,6 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
-    sqlite3
 ])
 
 PKG_CHECK_MODULES(COLORD, [
diff --git a/data/Makefile.am b/data/Makefile.am
index b436f12..e737488 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,6 +16,7 @@ dist_man1_MANS = simple-scan.1
 EXTRA_DIST = simple-scan.desktop.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
+             simple-scan-menu.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
diff --git a/data/Makefile.in b/data/Makefile.in
index c0f39f2..b7b43b8 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -333,6 +333,7 @@ dist_man1_MANS = simple-scan.1
 EXTRA_DIST = simple-scan.desktop.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
+             simple-scan-menu.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 3c5fe33..659daaf 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in
index da50c8a..3ce3d12 100644
--- a/data/org.gnome.SimpleScan.gschema.xml.in
+++ b/data/org.gnome.SimpleScan.gschema.xml.in
@@ -1,10 +1,4 @@
 <schemalist>
-  <enum id="org.gnome.SimpleScan.ScanDirection">
-    <value value="0" nick="top-to-bottom"/>
-    <value value="1" nick="left-to-right"/>
-    <value value="2" nick="bottom-to-top"/>
-    <value value="3" nick="right-to-left"/>
-  </enum>
   <enum id="org.gnome.SimpleScan.PageSide">
     <value value="1" nick="front"/>
     <value value="2" nick="back"/>
@@ -12,18 +6,6 @@
   </enum>
 
   <schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/" gettext-domain="simple-scan">
-    <key name="window-width" type="i">
-      <default>600</default>
-      <_summary>Window width in pixels</_summary>
-    </key>
-    <key name="window-height" type="i">
-      <default>400</default>
-      <_summary>Window height in pixels</_summary>
-    </key>
-    <key name="window-is-maximized" type="b">
-      <default>false</default>
-      <_summary>TRUE if the application window is maximized</_summary>
-    </key>
     <key name="selected-device" type="s">
       <default>''</default>
       <_summary>Device to scan from</_summary>
@@ -38,21 +20,6 @@
       <_summary>Type of document being scanned</_summary>
       <_description>Type of document being scanned. This setting decides on the scan resolution, colors and post-processing.</_description>
     </key>
-    <key name="scan-direction" enum="org.gnome.SimpleScan.ScanDirection">
-      <default>'top-to-bottom'</default>
-      <_summary>Direction of scan</_summary>
-      <_description>The direction of the scanner across the scanned page.</_description>
-    </key>
-    <key name="page-width" type="i">
-      <default>595</default>
-      <_summary>Width of scanned image in pixels</_summary>
-      <_description>The width of scanned image in pixels.  This value is updated to what the last scanned page was.</_description>
-    </key>
-    <key name="page-height" type="i">
-      <default>842</default>
-      <_summary>Height of scanned image in pixels</_summary>
-      <_description>The height of scanned image in pixels.  This value is updated to what the last scanned page was.</_description>
-    </key>
     <key name="paper-width" type="i">
       <default>0</default>
       <_summary>Width of paper in tenths of a mm</_summary>
@@ -73,11 +40,6 @@
         <_summary>Contrast of scan</_summary>
         <_description>The contrast adjustment from -100 to 100 (0 being none).</_description>
     </key>
-    <key name="page-dpi" type="i">
-      <default>72</default>
-      <_summary>Resolution of last scanned image</_summary>
-      <_description>The resolution in dots-per-inch of the previously scanned image.</_description>
-    </key>
     <key name="text-dpi" type="i">
       <default>150</default>
       <_summary>Resolution for text scans</_summary>
diff --git a/data/simple-scan-menu.ui b/data/simple-scan-menu.ui
new file mode 100644
index 0000000..ee5e7ea
--- /dev/null
+++ b/data/simple-scan-menu.ui
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.8 -->
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">New Document</attribute>
+        <attribute name="action">app.new_document</attribute>
+        <attribute name="accel"><![CDATA[<Ctrl>N]]></attribute>
+      </item>
+    </section>
+    <section>
+      <submenu>
+        <attribute name="label" translatable="yes">Document</attribute>
+        <section>
+          <item>
+            <attribute name="label" translatable="yes">Save</attribute>
+            <attribute name="action">app.save</attribute>
+            <attribute name="accel"><![CDATA[<Ctrl>S]]></attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Save As...</attribute>
+            <attribute name="action">app.save_as</attribute>
+            <attribute name="accel"><![CDATA[<Shift><Ctrl>S]]></attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Email...</attribute>
+            <attribute name="action">app.email</attribute>
+            <attribute name="accel"><![CDATA[<Ctrl>E]]></attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Print...</attribute>
+            <attribute name="action">app.print</attribute>
+            <attribute name="accel"><![CDATA[<Ctrl>P]]></attribute>
+          </item>
+        </section>
+      </submenu>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Help</attribute>
+        <attribute name="action">app.help</attribute>
+        <attribute name="accel"><![CDATA[F1]]></attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml
index b6fe6a6..7aa3b12 100644
--- a/data/simple-scan.gresource.xml
+++ b/data/simple-scan.gresource.xml
@@ -2,5 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/SimpleScan">
     <file preprocess="xml-stripblanks">simple-scan.ui</file>
+    <file preprocess="xml-stripblanks">simple-scan-menu.ui</file>
   </gresource>
 </gresources>
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index eb4ae02..eba3c72 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -1,97 +1,350 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 13:50:35 2013 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="simple_scan_window">
+  <!-- interface-requires gtk+ 3.8 -->
+  <object class="GtkDialog" id="authorize_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <property name="urgency_hint">True</property>
+    <property name="transient_for">simple_scan_window</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="authorize_button">
+                <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="vbox5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">5</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="authorize_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
+                <child>
+                  <object class="GtkEntry" id="username_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="password_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="visibility">False</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="username_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">username_entry</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="password_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">password_entry</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">authorize_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkAdjustment" id="brightness_adjustment">
+    <property name="lower">-100</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="contrast_adjustment">
+    <property name="lower">-100</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="device_store">
+    <columns>
+      <!-- column-name device_name -->
+      <column type="gchararray"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkImage" id="email_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">mail-send</property>
+  </object>
+  <object class="GtkImage" id="help_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-help</property>
+  </object>
+  <object class="GtkListStore" id="mode_store">
+    <columns>
+      <!-- column-name mode -->
+      <column type="gchararray"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">text</col>
+        <col id="1" translatable="yes" comments="Combo box label for text scan mode">Text</col>
+      </row>
+      <row>
+        <col id="0">photo</col>
+        <col id="1" translatable="yes" comments="Combo box label for photo scan mode">Photo</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="page_side_store">
+    <columns>
+      <!-- column-name side -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">3</col>
+        <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
+      </row>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="paper_size_store">
+    <columns>
+      <!-- column-name width -->
+      <column type="gint"/>
+      <!-- column-name height -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="photo_dpi_store">
+    <columns>
+      <!-- column-name dpi -->
+      <column type="gint"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" id="quality_adjustment">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkApplicationWindow" id="simple_scan_window">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
     <property name="icon_name">scanner</property>
-    <signal name="configure_event" handler="simple_scan_window_configure_event_cb"/>
-    <signal name="delete_event" handler="window_delete_event_cb"/>
-    <signal name="window_state_event" handler="simple_scan_window_window_state_event_cb"/>
+    <signal name="configure-event" handler="simple_scan_window_configure_event_cb" swapped="no"/>
+    <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
+    <signal name="window-state-event" handler="simple_scan_window_window_state_event_cb" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="main_vbox">
+      <object class="GtkBox" id="main_vbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="document_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Label on document menu (contains actions for this document, e.g. save, print)">_Document</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="document_menu">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="new_menuitem">
                         <property name="label">gtk-new</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="new_button_clicked_cb"/>
+                        <signal name="activate" handler="new_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="scan_menuitem">
                         <property name="label" translatable="yes" comments="Scan menu item">Sc_an</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="scan_menu">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkMenuItem" id="scan_single_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Scan menu item to scan a single page from the scanner">Single _Page</property>
                                 <property name="use_underline">True</property>
                                 <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                                <signal name="activate" handler="scan_button_clicked_cb"/>
+                                <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkMenuItem" id="scan_all_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
                                 <property name="use_underline">True</property>
                                 <accelerator key="f" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                                <signal name="activate" handler="continuous_scan_button_clicked_cb"/>
+                                <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkMenuItem" id="stop_scan_menuitem">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Menu entry to stop current scan">_Stop Scan</property>
                                 <property name="use_underline">True</property>
                                 <accelerator key="Escape" signal="activate"/>
-                                <signal name="activate" handler="stop_scan_button_clicked_cb"/>
+                                <signal name="activate" handler="stop_scan_button_clicked_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkSeparatorMenuItem" id="menuitem2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="text_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Text</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <signal name="toggled" handler="text_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="photo_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Photo</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">text_menuitem</property>
-                                <signal name="toggled" handler="photo_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                           </object>
@@ -103,10 +356,11 @@
                         <property name="label">gtk-save</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="save_file_button_clicked_cb"/>
+                        <signal name="activate" handler="save_file_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -114,61 +368,68 @@
                         <property name="label">gtk-save-as</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="save_as_file_button_clicked_cb"/>
+                        <signal name="activate" handler="save_as_file_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="email_menuitem">
                         <property name="label" translatable="yes" comments="Label on email menu item">_Email</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">email_image</property>
                         <property name="use_stock">False</property>
                         <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="email_button_clicked_cb"/>
+                        <signal name="activate" handler="email_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="print_menuitem">
                         <property name="label">gtk-print</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="print_button_clicked_cb"/>
+                        <signal name="activate" handler="print_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="document_sep_menuitem">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="preferences_menuitem">
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="preferences_button_clicked_cb"/>
+                        <signal name="activate" handler="preferences_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="quit_menuitem">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="quit_menuitem_activate_cb"/>
+                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" handler="quit_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -178,129 +439,145 @@
             <child>
               <object class="GtkMenuItem" id="page_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Page menu (contains action for each page, e.g. delete, crop)">_Page</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="page_menu">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="rotate_left_menuitem">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to rotate page to left (anti-clockwise)">Rotate _Left</property>
                         <property name="use_underline">True</property>
                         <accelerator key="bracketleft" signal="activate"/>
-                        <signal name="activate" handler="rotate_left_button_clicked_cb"/>
+                        <signal name="activate" handler="rotate_left_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="rotate_right_menuitem">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to rotate page to right (clockwise)">Rotate _Right</property>
                         <property name="use_underline">True</property>
                         <accelerator key="bracketright" signal="activate"/>
-                        <signal name="activate" handler="rotate_right_button_clicked_cb"/>
+                        <signal name="activate" handler="rotate_right_button_clicked_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="crop_menuitem">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Label for page crop submenu">_Crop</property>
                         <property name="use_underline">True</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="crop_menu">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioMenuItem" id="no_crop_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for no crop">_None</property>
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_as_radio">True</property>
-                                <signal name="toggled" handler="no_crop_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="no_crop_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="a4_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping page to A4 size">A_4</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a4_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="a4_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="a5_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping page to A5 size">A_5</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a5_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="a5_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="a6_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping page to A6 size">A_6</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="a6_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="a6_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="letter_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping page to US letter size">_Letter</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="letter_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="letter_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="legal_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping to page to US legal size">Le_gal</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="legal_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="legal_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="4x6_menuitem">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4&#xD7;6</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="four_by_six_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="four_by_six_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkRadioMenuItem" id="custom_crop_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping to custom page size">_Custom</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>
-                                <signal name="toggled" handler="custom_crop_menuitem_toggled_cb"/>
+                                <signal name="toggled" handler="custom_crop_menuitem_toggled_cb" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkSeparatorMenuItem" id="crop_sep_menuitem">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkMenuItem" id="crop_rotate_menuitem">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Menu item to rotate the crop area">_Rotate Crop</property>
                                 <property name="use_underline">True</property>
-                                <signal name="activate" handler="crop_rotate_menuitem_activate_cb"/>
+                                <signal name="activate" handler="crop_rotate_menuitem_activate_cb" swapped="no"/>
                               </object>
                             </child>
                           </object>
@@ -310,18 +587,20 @@
                     <child>
                       <object class="GtkMenuItem" id="page_move_left_menuitem">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to move the selected page to the left">Move Left</property>
                         <accelerator key="less" signal="activate"/>
-                        <signal name="activate" handler="page_move_left_menuitem_activate_cb"/>
+                        <signal name="activate" handler="page_move_left_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="page_move_right_menuitem">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes" comments="Menu item to move the selected page to the right">Move Right</property>
                         <property name="use_underline">True</property>
                         <accelerator key="greater" signal="activate"/>
-                        <signal name="activate" handler="page_move_right_menuitem_activate_cb"/>
+                        <signal name="activate" handler="page_move_right_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -329,20 +608,22 @@
                         <property name="label">gtk-copy</property>
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                        <signal name="activate" handler="copy_to_clipboard_button_clicked_cb"/>
+                        <signal name="activate" handler="copy_to_clipboard_button_clicked_cb" swapped="no"/>
                       </object>
-                    </child>                    
+                    </child>
                     <child>
                       <object class="GtkImageMenuItem" id="page_delete_menuitem">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="Delete" signal="activate"/>
-                        <signal name="activate" handler="page_delete_menuitem_activate_cb"/>
+                        <signal name="activate" handler="page_delete_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -352,29 +633,33 @@
             <child>
               <object class="GtkMenuItem" id="help_menuitem">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes" comments="Label on help menu">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="help_menu">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="help_contents_menuitem">
                         <property name="label" translatable="yes" comments="Help|Contents menu">_Contents</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="image">help_image</property>
                         <property name="use_stock">False</property>
                         <accelerator key="F1" signal="activate"/>
-                        <signal name="activate" handler="help_contents_menuitem_activate_cb"/>
+                        <signal name="activate" handler="help_contents_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="about_menuitem">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="about_menuitem_activate_cb"/>
+                        <signal name="activate" handler="about_menuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -384,23 +669,26 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <style>
-                <class name="primary-toolbar"/>
+              <class name="primary-toolbar"/>
             </style>
             <child>
               <object class="GtkToolButton" id="new_toolbutton">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
                 <property name="label" translatable="yes">New</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-new</property>
-                <signal name="clicked" handler="new_button_clicked_cb"/>
+                <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -410,28 +698,31 @@
             <child>
               <object class="GtkMenuToolButton" id="scan_toolbutton">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
                 <property name="is_important">True</property>
                 <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">scanner</property>
                 <property name="menu">scan_toolbutton_menu</property>
-                <signal name="clicked" handler="scan_button_clicked_cb"/>
+                <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="save_toolbutton">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
                 <property name="is_important">True</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-save</property>
-                <signal name="clicked" handler="save_file_button_clicked_cb"/>
+                <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -442,11 +733,12 @@
               <object class="GtkToolButton" id="stop_toolbutton">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
                 <property name="label" translatable="yes">Stop</property>
                 <property name="use_underline">True</property>
                 <property name="stock_id">gtk-stop</property>
-                <signal name="clicked" handler="stop_scan_button_clicked_cb"/>
+                <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -456,6 +748,7 @@
             <child>
               <object class="GtkSeparatorToolItem" id="toolbutton2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -465,11 +758,12 @@
             <child>
               <object class="GtkToolButton" id="rotate_left_toolbutton">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
                 <property name="label" translatable="yes" comments="Label on rotate page left (anti-clockwise) item">Rotate Left</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">object-rotate-left</property>
-                <signal name="clicked" handler="rotate_left_button_clicked_cb"/>
+                <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -479,11 +773,12 @@
             <child>
               <object class="GtkToolButton" id="rotate_right_toolbutton">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
                 <property name="label" translatable="yes" comments="Label on rotate page right (clockwise) item">Rotate Right</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">object-rotate-right</property>
-                <signal name="clicked" handler="rotate_right_button_clicked_cb"/>
+                <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -493,12 +788,13 @@
             <child>
               <object class="GtkToggleToolButton" id="crop_toolbutton">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Crop the selected page</property>
                 <property name="is_important">True</property>
                 <property name="label" translatable="yes">Crop</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">object-crop</property>
-                <signal name="toggled" handler="crop_toolbutton_toggled_cb"/>
+                <signal name="toggled" handler="crop_toolbutton_toggled_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -508,6 +804,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -517,139 +814,42 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="mode_store">
-    <columns>
-      <!-- column-name mode -->
-      <column type="gchararray"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">text</col>
-        <col id="1" translatable="yes" comments="Combo box label for text scan mode">Text</col>
-      </row>
-      <row>
-        <col id="0">photo</col>
-        <col id="1" translatable="yes" comments="Combo box label for photo scan mode">Photo</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="device_store">
+  <object class="GtkListStore" id="text_dpi_store">
     <columns>
-      <!-- column-name device_name -->
-      <column type="gchararray"/>
+      <!-- column-name dpi -->
+      <column type="gint"/>
       <!-- column-name label -->
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkDialog" id="authorize_dialog">
-    <property name="border_width">12</property>
+  <object class="GtkDialog" id="preferences_dialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">7</property>
+    <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
     <property name="resizable">False</property>
-    <property name="modal">True</property>
+    <property name="icon_name">scanner</property>
     <property name="type_hint">normal</property>
-    <property name="urgency_hint">True</property>
     <property name="transient_for">simple_scan_window</property>
+    <signal name="delete-event" handler="preferences_dialog_delete_event_cb" swapped="no"/>
+    <signal name="response" handler="preferences_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox5">
-            <property name="visible">True</property>
-            <property name="border_width">5</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="authorize_label">
-                <property name="visible">True</property>
-                <property name="label" comments="This label is set dynamically and is not translated">To connect to ? you need to authorize</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTable" id="table2">
-                <property name="visible">True</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">6</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkEntry" id="username_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="visibility">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="username_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes" comments="Label beside username entry">_Username for resource:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">username_entry</property>
-                  </object>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="password_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes" comments="Label beside password entry">_Password:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="authorize_button">
-                <property name="label" translatable="yes" comments="Button to submit authorization dialog">_Authorize</property>
+              <object class="GtkButton" id="preferences_close_button">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -660,173 +860,168 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">authorize_button</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkDialog" id="preferences_dialog">
-    <property name="border_width">7</property>
-    <property name="title" translatable="yes" comments="Title of preferences dialog">Preferences</property>
-    <property name="resizable">False</property>
-    <property name="icon_name">scanner</property>
-    <property name="type_hint">normal</property>
-    <property name="transient_for">simple_scan_window</property>
-    <signal name="response" handler="preferences_dialog_response_cb"/>
-    <signal name="delete_event" handler="preferences_dialog_delete_event_cb"/>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
         <child>
-          <object class="GtkTable" id="table3">
+          <object class="GtkGrid" id="grid3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
-            <property name="n_rows">7</property>
-            <property name="n_columns">2</property>
-            <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="source_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" comments="Label beside scan source combo box">Scan S_ource:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">device_combo</property>
               </object>
               <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="device_combo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="model">device_store</property>
                 <property name="button_sensitivity">on</property>
-                <signal name="changed" handler="device_combo_changed_cb"/>
+                <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="text_dpi_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" comments="Label beside scan source combo box">_Text Resolution:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">text_dpi_combo</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="photo_dpi_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" comments="Label beside scan source combo box">_Photo Resolution:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">photo_dpi_combo</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="text_dpi_combo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="model">text_dpi_store</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="photo_dpi_combo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="model">photo_dpi_store</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="page_side_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" comments="Label beside scan side combo box">Scan Side:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">photo_dpi_combo</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="page_side_combo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="model">page_side_store</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" comments="Label beside page size combo box">Page Size:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">photo_dpi_combo</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="paper_size_combo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="model">paper_size_store</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -836,27 +1031,27 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes" comments="Label beside brightness scale">Brightness:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">brightness_adjustment</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkScale" id="brightness_scale">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
                 <property name="adjustment">brightness_adjustment</property>
                 <property name="draw_value">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -869,24 +1064,25 @@
                 <property name="mnemonic_widget">contrast_scale</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkScale" id="contrast_scale">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
                 <property name="adjustment">contrast_adjustment</property>
                 <property name="draw_value">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -899,54 +1095,32 @@
                 <property name="mnemonic_widget">quality_scale</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkScale" id="quality_scale">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
                 <property name="adjustment">quality_adjustment</property>
                 <property name="draw_value">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">7</property>
-                <property name="bottom_attach">8</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="preferences_close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -957,120 +1131,52 @@
   </object>
   <object class="GtkMenu" id="scan_toolbutton_menu">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="scan_single_toolbutton_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="scan_button_clicked_cb"/>
+        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="scan_all_toolbutton_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="continuous_scan_button_clicked_cb"/>
+        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="menuitem1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="text_toolbutton_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Text</property>
         <property name="use_underline">True</property>
         <property name="draw_as_radio">True</property>
-        <signal name="toggled" handler="text_menuitem_toggled_cb"/>
+        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
       </object>
     </child>
     <child>
       <object class="GtkRadioMenuItem" id="photo_toolbutton_menuitem">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="label" translatable="yes">Photo</property>
         <property name="use_underline">True</property>
         <property name="active">True</property>
         <property name="draw_as_radio">True</property>
         <property name="group">text_toolbutton_menuitem</property>
-        <signal name="toggled" handler="photo_menuitem_toggled_cb"/>
+        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="photo_dpi_store">
-    <columns>
-      <!-- column-name dpi -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="text_dpi_store">
-    <columns>
-      <!-- column-name dpi -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkImage" id="help_image">
-    <property name="visible">True</property>
-    <property name="stock">gtk-help</property>
-  </object>
-  <object class="GtkImage" id="email_image">
-    <property name="visible">True</property>
-    <property name="icon_name">mail-send</property>
-  </object>
-  <object class="GtkListStore" id="page_side_store">
-    <columns>
-      <!-- column-name side -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">3</col>
-        <col id="1" translatable="yes" comments="Combo box label for scanning both sides of a page">Front and Back</col>
-      </row>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes" comments="Combo box label for scanning the front side of a page">Front</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1" translatable="yes" comments="Combo box label for scanning the back side of a page">Back</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="paper_size_store">
-    <columns>
-      <!-- column-name width -->
-      <column type="gint"/>
-      <!-- column-name height -->
-      <column type="gint"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" id="brightness_adjustment">
-    <property name="lower">-100</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="contrast_adjustment">
-    <property name="lower">-100</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="quality_adjustment">
-    <property name="lower">0</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>
diff --git a/help/C/figures/icon.png b/help/C/figures/icon.png
new file mode 100644
index 0000000..8cfefc1
--- /dev/null
+++ b/help/C/figures/icon.png
diff --git a/help/C/figures/preferences.png b/help/C/figures/preferences.png
new file mode 100644
index 0000000..fe3bbe1
--- /dev/null
+++ b/help/C/figures/preferences.png
diff --git a/help/C/figures/scan_toolbar.png b/help/C/figures/scan_toolbar.png
new file mode 100644
index 0000000..7736d68
--- /dev/null
+++ b/help/C/figures/scan_toolbar.png
diff --git a/help/Makefile.am b/help/Makefile.am
index 66bca3c..fd8d7e8 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -2,6 +2,12 @@
 
 HELP_ID = simple-scan
 HELP_POT = simple-scan-help.pot
+
+HELP_MEDIA = \
+             figures/icon.png		\
+             figures/preferences.png	\
+             figures/scan_toolbar.png
+
 HELP_FILES = index.page \
              adf.page \
              crop.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index f82d73f..59db376 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -230,6 +230,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 HELP_ID = simple-scan
 HELP_POT = simple-scan-help.pot
+HELP_MEDIA = \
+             figures/icon.png		\
+             figures/preferences.png	\
+             figures/scan_toolbar.png
+
 HELP_FILES = index.page \
              adf.page \
              crop.page \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 93a99e0..f1e46ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
 [encoding: UTF-8]
 [type: gettext/glade]data/simple-scan.ui
 data/simple-scan.desktop.in
+data/simple-scan-menu.ui
 data/org.gnome.SimpleScan.gschema.xml.in
 src/book.vala
 src/book-view.vala
diff --git a/po/af.po b/po/af.po
index 81034b7..77725a3 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,357 +7,313 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Verleen toegang"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Gebruikersnaam vir hulpbron:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Wagwoord:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teks"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Voor en agter"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Voor"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Terug"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Eenvoudige Skandeer"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_andeer"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Enkel _Bladsy"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle Bladsye Vanaf _Voerder"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Staak skandering"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teks"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-pos"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Bladsy"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Roteer Insnit"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Beweeg na regs"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Begin 'n nuwe dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nuwe"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skandeer"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Stoor"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Staak huidige skandering"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roteer die bladsy na links (anti-kloksgewys)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Roteer linksom"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roteer die bladsy na regs (kloksgewys)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Roteer regsom"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Snoei die gekose bladsy"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Insny"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Gebruikersnaam vir hulpbron:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Wagwoord:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Verleen toegang"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Voorkeure"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Foto resolusie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skandeer Kant:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Bladsy grootte:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Voor en agter"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Voor"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Terug"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skandeer dokumente"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Venster wydte in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Venster hoogte in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Skanderingstoestel"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipe dokument wat geskandeer word"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Skanderingsrigting"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Wydte van geskandeerde beeld in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Die wydte van geskandeerde beeld in pixels. Die waarde is verstel na die "
-"waarde van die laaste geskandeerde bladsy."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Hoogte van geskandeerde beeld in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Die hoogte van geskandeerde beeld in pixels. Die waarde is verander na die "
-"waarde van die laaste geskandeerde bladsy."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Wydte van papier in tiendes van 'n mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -365,11 +321,11 @@ msgstr ""
 "Die wydte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
 "bespeuring)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Hoogte van papier in tiendes van 'n mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -377,90 +333,82 @@ msgstr ""
 "Die hoogte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
 "papierbespeuring)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolusie van die laaste geskandeerde beeld"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolusie van geskandeerde teks"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolusie van geskandeerde foto's"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Kant van bladsy om te skandeer"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Gids om lêers in te stoor"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Die gids om die lêers in stoor. Verstek is die dokumente gids indien "
 "onveranderd"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Geen skandeerders is beskikbaar nie. Koppel asb.'n skandeerder."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Kan nie aan skandeerder koppel nie"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nie in staat om te begin skandeer nie"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -499,98 +447,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Stoor as..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alle lêers"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -607,16 +567,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -629,94 +589,88 @@ msgstr ""
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Kontrolleer asseblief u installasie"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -728,3 +682,38 @@ msgstr ""
 #~ msgstr ""
 #~ "Gebruik:\n"
 #~ "%s [TOESTEL...] - Skandeerder"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Skanderingsrigting"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Wydte van geskandeerde beeld in pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Venster wydte in pixels"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Venster hoogte in pixels"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Hoogte van geskandeerde beeld in pixels"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Die hoogte van geskandeerde beeld in pixels. Die waarde is verander na die "
+#~ "waarde van die laaste geskandeerde bladsy."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolusie van die laaste geskandeerde beeld"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Die wydte van geskandeerde beeld in pixels. Die waarde is verstel na die "
+#~ "waarde van die laaste geskandeerde bladsy."
diff --git a/po/ar.po b/po/ar.po
index 7b41fcf..eef9e4c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:56+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_خوّل"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "اسم _مستخدم المورد:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_كلمة السر:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "نص"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "صورة"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "الخلف والأمام"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "الأمام"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "الخلف"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "الماسحة الضوئية"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "م_ستند"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "امسح"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "صفحة مفردة"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "كل الصفحات من  _المغذّي"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "أو_قف المسح"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "نص"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "صورة"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_بريد إلكتروني"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_صفحة"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "أدر  ي_سارًا"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "أدر ي_مينًا"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "ا_قتصاص"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "لا _شيء"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_خطاب"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_قانوني"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#×D7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_مخصص"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "أ_در الاقتصاص"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "تحرك لليسار"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "تحرك لليمين"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_مساعدة"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "ال_محتويات"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "ابدأ مستندا جديدا"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "جديد"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "امسح صفحة مفردة من الماسحة"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "امسح"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "احفظ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "أوقف المسح الحالي"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "أوقف"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "أدر الصفحة لليسار (عكس عقارب الساعة)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "أدر يسارا"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "أدر الصفحة لليمين (مع عقارب الساعة)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "أدر يمينا"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "اقتص الصفحة المحددة"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "اقتصاص"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "اسم _مستخدم المورد:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_كلمة السر:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_خوّل"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "التفضيلات"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "م_صدر المسح:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "ميز ال_نص"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "ميز ال_صورة:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "جهة المسح:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "حجم الصفحة:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "الخلف والأمام"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "الأمام"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "الخلف"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "امسح المستندات"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "عرض النافذة بالبكسل"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "ارتفاع النافذة بالبكسل"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "صحيح إن كانت نافذة البرنامج مكبرة"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "الجهاز الذي سيمسح منه"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "جهاز SANE  للحصول على الصور منه."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "نوع المستند الذي يجري مسحه"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,139 +311,100 @@ msgstr ""
 "نوع المستند الممسوح. هذا الإعداد يتقرر على أساس ميز المسح، والألوان، ومرحلة "
 "ما بعد المعاجلة."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "اتجاه المسح"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "اتجاه الماسحة خلال الصفحة الممسوحة."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "عرض الصورة الممسوحة بالبكسل."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"عرض الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة السابقة."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "ارتفاع الصورة الممسوحة بالبكسل"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"ارتفاع الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة "
-"السابقة."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "عرض الورقة بأعشار الملم"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "عرض الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "ارتفاع الورقة بأعشار الملم"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "ارتفاع الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "ميز آخر صورة ممسوحة"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "الميز بالنقطة في البوصة للصورة الممسوحة سابقا."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "ميز مسح النصوص"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح النصوص."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "ميز مسح الصور"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح الصور."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "الجهة التي ستُمسح"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "جهة الصفحة التي ستُمسح."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "دليل حفظ الملفات"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "الدليل الذي ستحفظ به الملفات. يستخدم دليل المستندات إذا لم يحدد هنا."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "لا توجد أي ماسحات. من فضلك وصّل ماسحة."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "تعذّر الاتصال بالماسحة"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "خطأ في التواصل مع الماسحة"
 
@@ -494,98 +443,110 @@ msgstr "[جهاز...] - أداة مسح ضوئي"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "كل الملفات"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "اختر _نوع الملف"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "فشل حفظ الملف"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ستضيع جميع التغييرات للأبد إذا لم تحفظ."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -612,16 +573,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -637,98 +598,110 @@ msgstr ""
 "  rashed alhazimi https://launchpad.net/~linex"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "ملفات مفقودة"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "من فضلك تحقق من تثبيتك"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#×D7;6"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "ارتفاع النافذة بالبكسل"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "عرض النافذة بالبكسل"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "ارتفاع الصورة الممسوحة بالبكسل"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "صحيح إن كانت نافذة البرنامج مكبرة"
+
+#~ msgid "Direction of scan"
+#~ msgstr "اتجاه المسح"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -743,3 +716,28 @@ msgstr "يحفظ الصفحة %d من أصل %d"
 #~ msgstr ""
 #~ "نوع المستند الذي يجري مسحه. 'text' للمستندات النصية، 'photo' للصور. يحدد هذا "
 #~ "الإعداد دقة المسح والألوان والمعالجة البعدية."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "عرض الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة السابقة."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "ارتفاع الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة "
+#~ "السابقة."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "عرض الصورة الممسوحة بالبكسل."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "الميز بالنقطة في البوصة للصورة الممسوحة سابقا."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "اتجاه الماسحة خلال الصفحة الممسوحة."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "ميز آخر صورة ممسوحة"
diff --git a/po/ast.po b/po/ast.po
index fef4d5d..6525cf5 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Nome d'usuariu pal recursu:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Contraseña"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Testu"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Semeya"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Documentu"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "U_na páxina"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Tol_es páxines dende l'alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Testu"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Semeya"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Voltiar a la e_squierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Dengún"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Lle_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizáu"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Voltiar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
-msgstr "_Aida"
+msgstr "_Ayuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Nome d'usuariu pal recursu:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Contraseña"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferencies"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Brillu:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Calidá:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr ""
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,136 +311,100 @@ msgstr ""
 "Triba de documentu escaneándose. Esta configuración afita la resolución "
 "d'escanéu, colores y post-procesamientu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "La direición del escáner a traviés de la páxina escaneada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Brillu d'escanéu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Axuste del brillu dende -100 a 100 (siendo 0 ensin axuste)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste del escanéu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Axuste de contraste dende -100 a 100 (siendo 0 ensin axuste)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "El llau de la páxina a escanear."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Calidá de la compresión de JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Calidá de la compresión de JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nun puede coneutase col escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nun puede anicase l'escáner"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Fallu de comunicación col escáner"
 
@@ -493,98 +445,110 @@ msgstr ""
 "Executa '%s --help' pa ver una llista completa de les opciones disponibles "
 "na llinia de comandos."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Zarrar"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requierse nome d'usuariu y contraseña p'acceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Guardar como..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Encaboxar"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Guardar"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Falló al guardar el ficheru"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nun pudo guardase la imaxe de previsualización"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -613,16 +577,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -632,98 +596,95 @@ msgstr ""
 "  ivarela https://launchpad.net/~ivarela"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Ficheros non alcontraos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Por favor, comprueba la instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -754,3 +715,6 @@ msgstr "Guardando la páxina %d de %d"
 #~ "síncrones\n"
 #~ "  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
 #~ "  --g-fatal-warnings              Facer que tolos avisos seyan fatales"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La direición del escáner a traviés de la páxina escaneada."
diff --git a/po/az.po b/po/az.po
index 8729f5a..d061d59 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Hər iki üz"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Ön"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Geri"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "_AvtoYükləmədəki bütün səhifələr"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr ""
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Seçilmiş səhifəni kəs"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Kəs"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Hər iki üz"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Ön"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Geri"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,110 +561,107 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Emin Mastizada https://launchpad.net/~emin25"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
diff --git a/po/bg.po b/po/bg.po
index 3307a62..b7050a6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,487 +7,429 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-12-01 09:04+0000\n"
 "Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Идентификация"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Потребителско име за ресурса:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Парола:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Текст"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Снимка"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Предна и обратна страна"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Предна страна"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Обратна страна"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Опростено сканиране"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Ска_ниране"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
-msgstr "Единична страница"
+msgstr "Една _страница"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Всички страници от _подавача"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
-msgstr "_Спиране на сканирането"
-
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Текст"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Снимка"
+msgstr "_Спири сканирането"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
-msgstr "_Електронна поща"
+msgstr "Изпрати по _имейл"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
-msgstr "Завъртане _наляво"
+msgstr "Завърти _наляво"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
-msgstr "Завъртане на_дясно"
+msgstr "Завърти на_дясно"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
-msgstr "И_зрязване"
+msgstr "_Изрежи"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Нищо"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
-msgstr "_Letter"
+msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
-msgstr "Le_gal"
+msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
-msgstr "_Потребителско"
+msgstr "_Персонализирано"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "_Завъртане на изрязването"
+msgstr "_Завърти изрязаното"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr "Преместване наляво"
+msgstr "Премести наляво"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr "Преместване надясно"
+msgstr "Премести надясно"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Помощ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Съдържание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
-msgstr "Започване на нов документ"
+msgstr "Създай нов документ"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Нов"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
-msgstr "Сканиране на"
+msgstr "Сканиране на една страница със скенера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
-msgstr "Сканиране"
+msgstr "Сканирай"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
-msgstr "Запис на документа като файл"
+msgstr "Съхрани документа като файл"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
-msgstr "Запазване"
+msgstr "Съхрани"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
-msgstr "Спиране на текущото сканиране"
+msgstr "Спри текущото сканиране"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
-msgstr "Спиране"
+msgstr "Спри"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Завъртане страницата на ляво (обратно на часовниковата стрелка)"
+msgstr "Завърти страницата на ляво (обратно на часовниковата стрелка)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
-msgstr "Завъртане наляво"
+msgstr "Завърти наляво"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
-msgstr "Завъртане страницата на дясно (по часовниковата стрелка)"
+msgstr "Завърти страницата на дясно (по часовниковата стрелка)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
-msgstr "Завъртане надясно"
+msgstr "Завърти надясно"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
-msgstr "Отрязва избраната страница"
+msgstr "Изрежи избраната страница"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
-msgstr "Отрязване"
-
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Потребителско име за ресурса:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Парола:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Упълномощаване"
+msgstr "Изрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
-msgstr "Източник"
+msgstr "Изт_очник на сканиране:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr "_Разделителна способност на текста:"
+msgstr "_Резолюция на текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
-msgstr "_Разделителна способност на снимката:"
+msgstr "_Резолюция на снимката:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Избор на страна за сканиране:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Размер на листа:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Яркост:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Контраст:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Предна и обратна страна"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Предна страна"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Обратна страна"
+msgid "Quality:"
+msgstr "Качество:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Сканиране на документи"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Ширина на прозореца в пиксели"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Височина на прозореца в пиксели"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE ако прозореца на приложението е максимизиран."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
-msgstr "Устройство, от което да се сканира"
+msgstr "Устройство за сканиране"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
-msgstr "SANE устройство, от което да се получи изображението."
+msgstr "SANE устройство за получаване на изображения."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
-msgstr "Типове документи, които се сканират"
+msgstr "Вид на сканираният документ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
-"Типът на сканирания документ. Тази настройка определя разделителната "
-"способност на сканиране, цветовете и последващата обработка."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Посока на сканиране"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Посоката на сканиране на страницата."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Ширина на сканираните изображения в пиксели"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина на сканираните изображения в пиксели. Тази стойност е обновена до "
-"стойността от на последната сканирана страница."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Височина на сканираното изображение в пиксели"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Височина на сканираните изображения в пиксели. Тази стойност е обновена до "
-"височината на последната сканирана страница."
+"Видът на сканирания документ. Тази настройка регулира резолюцията, "
+"дълбочината на цветовете, както и пост-обработката."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Ширина на хартията в десетки милиметри"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Широчина на листа в десетки милиметри (избери 0 за автоматично разпознаване)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Височина на хартията в десетки милиметри"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Височина на хартията в десетки милиметри (или 0 за автоматично разпознаване)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Яркост на изображението"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Настройката на яркостта от -100 до 100 (0 — не се променя)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Контраст на изображението"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Разделителна способност на последното сканирано изображение"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"Разделителна способност в точки-за-инч от предишното сканирано изображение."
+msgstr "Настройката на контраста от -100 до 100 (0 — не се променя)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
-msgstr "Разделителна способност на текстовите сканирания"
+msgstr "Резолюция на текстовите сканирания"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"Разделителна способност в точки-за-инч, която да се използва, когато се "
-"сканира текст."
+msgstr "Резолюция в точки-за-инч при сканиране на текст."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
-msgstr "Разделителна способност на фото сканиранията"
+msgstr "Резолюция за сканиране на фотографиите"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Разделителна способност в точки-за-инч, която да се използва при сканиране "
-"на снимки."
+msgstr "Резолюция в точки-за-инч при сканиране на снимки."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Страна на листа за сканиране"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "От коя страна на страницата да се сканира."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
-msgstr "Папка, където да се запазят файловете"
+msgstr "Папка за съхраняване на файловете"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"Папка, където да се запазват файловете. По подразбиране, ако не е настроено, "
-" е папката с документи."
+"Папка за съхраняване на файловете. По подразбиране се използва папката с "
+"документи."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Стойността на качеството, за използваната JPEG компресия"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Стойността на качеството, за използваната JPEG компресия."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Не са налични скенери. Моля свържете скенер."
+msgstr "Няма налични скенери. Моля свържете скенер."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Не може да се осъществи връзка със скенера"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Грешка при комуникацията със скенера"
 
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
 msgid "Show release version"
-msgstr "Показване на версията"
+msgstr "Покажи версията"
 
 #. Help string for command line --debug flag
 #: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr "Показване на съобщения за изчистване на грешки"
+msgstr "Показвай съобщения за изчистване на грешки"
 
 #: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
-"Поправяне на PDF файлове, създадени с по-стари версии на на Simple Scan"
+msgstr "Поправи PDF файловете, създадени с по-стари версии на Simple Scan"
 
 #. Title of error dialog when scan failed
 #: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr "Неуспех при сканиране"
+msgstr "Неусшно сканиране"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.vala:316
@@ -504,100 +446,112 @@ msgstr "[DEVICE...] - Инструмент за сканиране"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Изпълнете „%s --help“, за да видите списък с всички опции на командния ред."
+"Изпълнете „%s --help“, за да видите списъка с всички опции на командния ред."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Затвори"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
-msgstr "Запазване като..."
+msgstr "Съхрани като..."
+
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Отмени"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Съхрани"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Всички файлове"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Избор на _тип файл"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
-msgstr "PNG (без загуби)"
+msgstr "PNG (без загуби на качеството)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
-msgstr "Неуспех при запазване на файл"
+msgstr "Неусшно съхраняване на файла"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ако не запазите, промените ще бъдат изгубени."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
-msgstr "Запазване на текущия документ?"
+msgstr "Да съхраним ли текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
-msgstr "Отказ от промените"
+msgstr "Откажи промените"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
-msgstr "Невъзможно отварянето на приложение за преглед на изображението"
+msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,19 +582,20 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
-msgstr "Относно Опростено сканиране"
+msgstr "За програмата"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Atanas Kovachki https://launchpad.net/~zdar\n"
 "  Boyan Sotirov https://launchpad.net/~lz1dsb\n"
 "  Krasimir Chonov https://launchpad.net/~kchonov\n"
 "  Miroslav E. Hadzhiev (Хаджиев) https://launchpad.net/~extigyro\n"
@@ -650,97 +605,94 @@ msgstr ""
 "  Филип Андонов https://launchpad.net/~vonodna"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
-msgstr "Запис на документа преди излизане?"
+msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
-msgstr "Излизане без запазване"
+msgstr "Излез без запазване"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (висока разделителна способност)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Липсващи файлове"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
-msgstr "Моля проверете инсталацията си"
+msgstr "Моля, проверете дали правилно сте инсталирали програмата"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
-msgstr "Смяна на _скенер"
+msgstr "Смени _скенера"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Тъмно"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Светло"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Малко"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Много"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Минимално"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Максимално"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
-msgstr "Запазване на документа..."
+msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr "Запазване на страница %d от %d"
+msgstr "Съхраняване на страница %d от %d"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
 
 #, c-format
 #~ msgid ""
@@ -750,6 +702,9 @@ msgstr "Запазване на страница %d от %d"
 #~ "Употреба:\n"
 #~ "  %s [УСТРОЙСТВО...] - Инструмент за сканиране"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Посока на сканиране"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -757,6 +712,9 @@ msgstr "Запазване на страница %d от %d"
 #~ "Посоката на скенера през сканираната страница. Може да бъде една от "
 #~ "следните: 'отгоре-надолу' 'отдолу-нагоре' 'от лява-надясно' 'от дясно-наляво'"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Височина на сканираното изображение в пиксели"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -772,6 +730,9 @@ msgstr "Запазване на страница %d от %d"
 #~ "за снимки. Тези настройки определят разделителната способност на "
 #~ "сканирането, цветовете и последващата обработка."
 
+#~ msgid "Window width in pixels"
+#~ msgstr "Ширина на прозореца в пиксели"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -788,6 +749,12 @@ msgstr "Запазване на страница %d от %d"
 #~ "  --help-all Показване всички помощни опции\n"
 #~ "  --help-gtk Показване на GTK+ опции"
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Височина на прозореца в пиксели"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Ширина на сканираните изображения в пиксели"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -807,3 +774,29 @@ msgstr "Запазване на страница %d от %d"
 #~ "  --sync Извикванията на X да са синхронни\n"
 #~ "  --gtk-module=МОДУЛИ Зареждане на допълнителни модули на GTK+\n"
 #~ "  --g-fatal-warnings Всички предупреждения да се считат за грешки"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE ако прозореца на приложението е максимизиран."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Посоката на сканиране на страницата."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Ширина на сканираните изображения в пиксели. Тази стойност се обновява при "
+#~ "всяко ново сканиране."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Височина на сканираните изображения в пиксели. Тази стойност се обновява при "
+#~ "всяко ново сканиране."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Резолюция в точки-за-инч от предишното сканирано изображение."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Резолюция на последното сканирано изображение"
diff --git a/po/bo.po b/po/bo.po
index ca9664c..f0479bc 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,456 +7,404 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tibetan <bo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "ཐོབ་ཐང་སྟེར_A"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "གཏེར་མཛོད་སྤྱོད་མཁན་གྱི་མིང་_U:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "གསང་གྲངས_P:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "ཡི་གེ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "པར"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "རྒྱབ་ཕྱོགས་དང་མདུན་ཕྱོགས"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "མདུན་ཕྱོགས"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "རྒྱབ་ཕྱོགས"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "པར་བཤུ་དཀྱུས་མ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "ཡི་གེ_D"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "པར་བཤུ_a"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "ཤོག་བུ་རྐང་ཅིག _P"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོག་ལེབ་ཡོངས་རྫོགས _F"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "པར་ལེན་མཚམས་བཞག_S"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "ཡི་གེ"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "པར"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "གློག་འཕྲིན_E"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "ཤོག་ལེབ_P"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "གཡོན་སྐོར _L"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "གཡས་སྐོར་ _R"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "གཅོད_C"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "ཅི་མེད་པ_N"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "འཕྲིན་ཡིག_L"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "ཁྲིམས་མཐུན_g"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "སྲོལ་རྒྱུན_C"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "དྲས་གཅོད་སྐོར་བ_R"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "གཡོན་ལ་སྤོར"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "གཡས་ལ་སྤོར"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "རོགས་རམ_H"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "ནང་གསེས_C"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "ཡིག་གེ་གསར་འཛུགས"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "གསར་པ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "པར་བཤུ་ཆས་ནས་བྱུང་བའི་ཤོག་བུ་རྐང་ཅིག་དེ་པར་བཤུ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "པར་བཤུ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "གསོག་ཉར"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "པར་བཤུ་བྱེད་བཞིན་པ་དེ་མཚམས་བཞག"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "མཚམས་བཞག"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ཤོག་ལེབ་གཡོན་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "གཡོན་སྐོར"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ཤོག་ལེབ་གཡས་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "གཡས་སྐོར"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད་བཟོ"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "གཅད"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "གཏེར་མཛོད་སྤྱོད་མཁན་གྱི་མིང་_U:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "གསང་གྲངས_P:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "ཐོབ་ཐང་སྟེར_A"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "པར་བཤུ་གཏེར་མཛོད_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "ཡི་གེའི་སྤུས་ཚད_T"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "པར་གྱི་སྤྭུས་ཚད"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "ཟུར་པར་བཤུ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "ཤོག་ལེབ་ཞེང་ཚད"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "རྒྱབ་ཕྱོགས་དང་མདུན་ཕྱོགས"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "མདུན་ཕྱོགས"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "རྒྱབ་ཕྱོགས"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "ཡིག་གེ་པར་བཤུ"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Window width in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Window height in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "གལ་སྲིད་ཉེར་སྤྱོད་སྒེའུ་ཁུང་རྒྱ་བསྐྱེད་ཚར་ན་TRUEའམ་་བདེན་པར་འཛུགས"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "པར་རིས་འདོནསའི་SANE་སྒྲིག་ཆས་"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "པར་བཤུ་ཡིག་ཆའི་རིགས"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "པར་བཤུ་ཁ་ཕྱོགས"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Width of scanned image in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "པར་བཤུ་བྱས་ཟིན་པའི་གཟུགས་བརྙན་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"ཐེངས་རྗེས་མའི་པར་བཤུའི་པར་རིས་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས། ཐོབ་གྲངས་འདི་ "
-"ཐེངས་རྗེས་མའི་པར་བཤུ་འདྲ་པར་གསར་བསྒྱུར་བྱས་ཟིན"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "ཤོག་ལེབ་ཀྱི་མཐོ་ཚད་བཅུ་ཆའི་རྨིད་སྟོང་ཆ་ཚོད་"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "ཐེངས་རྗེས་མར་པར་བཤུའི་གཟུགས་བརྙན་གྱི་སྤུས་ཚད"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "ཡི་གེའི་པར་བཤུའི་སྤུས་ཚད"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "པར་བཤུའི་སྤུས་ཚད"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "པར་བཤུ་དགོས་པའི་ཤོག་ཟུར"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ཡིག་ཆ་གསོག་སྣོད"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "ཡིག་ཆ་གསོག་སའི་གནས། "
 "གལ་སྲིད་རང་མོས་སྒྲིག་འཛུགས་མེད་ན་སྔོན་འཛུགས་འཇུག་སྣོད་བེད་སྤྱོད"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "པར་བཤུ་ཆས་བསྒྲིགས་མི་འདུག པར་བཤུ་ཆས་ཞིག་སྒྲིགས་རོགས"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "པར་བཤུ་ཆས་དང་སྦྲེལ་མ་ཐུབ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "པར་བཤུ་འགོ་འཛུགས་མ་ཐུབ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "པར་བཤུ་ཆས་དང་འབྲེལ་གཏུགས་མ་ཐུབ་པའི་ནོར་འཁྲུལ"
 
@@ -495,98 +443,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "ཡིག་ཆའི་རིགས་གདམ་པ_T"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "ཡིག་ཆ་གསོག་འཇོག་བྱེད་མ་ཐུབ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ཁྱོད་ཀྱིས་གསོག་འཇོག་མ་བྱས་ན་བཟོ་བཅོས་རྣམས་ནམ་ཡང་བརླགས་འགྲོ་ངེས"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -615,114 +575,123 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Tennom https://launchpad.net/~tennomyathog"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (སྤུས་ཚད་མཐོན་པོ)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "ཡིག་ཆ་བརླགས་ཚར་འདུག"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "ཁྱོད་ཀྱི་སྒྲིག་འཇུག་ཞིབ་བཤེར་གནང་རོགས"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "པར་བཤུ་ཁ་ཕྱོགས"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "པར་བཤུ་བྱས་ཟིན་པའི་གཟུགས་བརྙན་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "ཐེངས་རྗེས་མར་པར་བཤུའི་གཟུགས་བརྙན་གྱི་སྤུས་ཚད"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "གལ་སྲིད་ཉེར་སྤྱོད་སྒེའུ་ཁུང་རྒྱ་བསྐྱེད་ཚར་ན་TRUEའམ་་བདེན་པར་འཛུགས"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -731,6 +700,20 @@ msgstr ""
 #~ "'གོང་ནས་འོག' 'འོག་ནས་གོང' 'གཡོན་ནས་གཡས' 'གཡས་ནས་གཡོན'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "ཐེངས་རྗེས་མའི་པར་བཤུའི་པར་རིས་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས། ཐོབ་གྲངས་འདི་ "
+#~ "ཐེངས་རྗེས་མའི་པར་བཤུ་འདྲ་པར་གསར་བསྒྱུར་བྱས་ཟིན"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -739,6 +722,15 @@ msgstr ""
 #~ "པར་རིས་ཡིག་ཆ་ཡིན་པ། སྒྲིག་འཛུགས་འདིའི་པར་བཤུའི་སྤུས་ཚད། "
 #~ "ཚོན་མདོག་དང་འཇུག་མཐའི་འགུལ་སྐྱོད་ཐག་གཅོད་བྱེད"
 
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Width of scanned image in pixels"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Window height in pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Window width in pixels"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
diff --git a/po/ca.po b/po/ca.po
index 526c9f0..7089933 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Ambdues cares"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Revers de la pàgina"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Esc_aneja"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Atura"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Escapça"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Contrasenya:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autoritza"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Ambdues cares"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Anvers de la pàgina"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Revers de la pàgina"
+msgid "Quality:"
+msgstr "Qualitat:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Amplada de la finestra en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Alçada de la finestra en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipus de document a escanejar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "El tipus de document que s'està escanejant. Aquest paràmetre decideix la "
 "resolució d'escaneig, els colors i el processament posterior."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direcció de l'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "La direcció de l'escànner a través de la pàgina escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Amplada de la imatge escanejada en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
-"al que tenia l'última pàgina escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Alçada de la imatge escanejada en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
-"que tenia l'última pàgina escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Amplada del paper en dècimes de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
 "paper)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Alçada del paper en dècimes parts d'un mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,91 +335,82 @@ msgstr ""
 "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
 "paper)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Brillantor de l'escaneig"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Contrast de l'escaneig"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolució de l'última imatge escanejada"
+msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"La resolució en punts per polzada de la imatge prèviament escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolució per l'escaneig de text"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La resolució en punts per polzada quan s'escanegi text."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolució per l'escaneig de fotos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "La resolució en punts per polzada quan s'escanegin fotos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Cara de la pàgina a escanejar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "La cara de la pàgina a escanejar."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directori on desar els fitxers"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "El directori on desar els fitxers. Per defecte serà el directori de "
 "documents si no es defineix."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hi ha cap escàner disponible. Si us plau, connecteu-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "No s'ha pogut connectar a l'escàner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
@@ -505,98 +452,110 @@ msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Tanca"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "De_sa"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho deseu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut desar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,19 +587,20 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Adolfo Jayme https://launchpad.net/~fitoschido\n"
 "  David Planella https://launchpad.net/~dpm\n"
 "  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
 "  J. Gregpori Raya https://launchpad.net/~gregori\n"
@@ -651,94 +611,88 @@ msgstr ""
 "  pancake https://launchpad.net/~pancake"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Manquen fitxers"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Comproveu la vostra instal·lació"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Més fosc"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Més clar"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Menys"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Més"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Mínim"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Màxim"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
@@ -773,6 +727,15 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  --gtk-module=MÒDULS             Carrega mòduls de la GTK+ addicionals\n"
 #~ "  --g-fatal-warnings              Fa que tots els avisos siguin fatals"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Alçada de la imatge escanejada en píxels"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direcció de l'escaneig"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -788,6 +751,23 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de dreta a "
 #~ "esquerra)."
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
+#~ "que tenia l'última pàgina escanejada."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "La resolució en punts per polzada de la imatge prèviament escanejada."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolució de l'última imatge escanejada"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -797,6 +777,22 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
 #~ "postprocessament."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Alçada de la finestra en píxels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Amplada de la finestra en píxels"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+#~ "al que tenia l'última pàgina escanejada."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Amplada de la imatge escanejada en píxels"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -812,3 +808,6 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ "  -h, --help                      Mostra l'ajuda de les opcions\n"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index c424460..46ca615 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Ambdues cares"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Revers de la pàgina"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Esc_aneja"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Pàgina _individual"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Alça el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Alça"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Para l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Para"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Escapça"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Contrasenya:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autoritza"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Ambdues cares"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Anvers de la pàgina"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Revers de la pàgina"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Amplada de la finestra en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Alçada de la finestra en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipus de document a escanejar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "El tipus de document que s'està escanejant. Este paràmetre decideix la "
 "resolució d'escaneig, els colors i el processament posterior."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direcció de l'escaneig"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "La direcció de l'escànner a través de la pàgina escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Amplada de la imatge escanejada en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"L'amplada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
-"que tenia l'última pàgina escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Alçada de la imatge escanejada en píxels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"L'alçada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
-"que tenia l'última pàgina escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Amplada del paper en dècimes de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
 "paper)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Alçada del paper en dècimes parts d'un mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,91 +335,82 @@ msgstr ""
 "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
 "paper)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolució de l'última imatge escanejada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"La resolució en punts per polzada de la imatge prèviament escanejada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolució per l'escaneig de text"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La resolució en punts per polzada quan s'escanegi text."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolució per l'escaneig de fotos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "La resolució en punts per polzada quan s'escanegin fotos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Cara de la pàgina a escanejar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "La cara de la pàgina a escanejar."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directori on alçar els fitxers"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "El directori on alçar els fitxers. Per defecte serà el directori de "
 "documents si no es defineix."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hi ha cap escàner disponible. Per favor, connecteu-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "No s'ha pogut connectar a l'escàner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-s'amb l'escàner"
 
@@ -505,98 +452,110 @@ msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordes."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Anomena i alça..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "No s'ha pogut alçar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho alceu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Voleu alçar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut alçar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,16 +587,16 @@ msgstr ""
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -645,98 +604,107 @@ msgstr ""
 "  Joan Duran https://launchpad.net/~jodufi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Voleu alçar el document abans d'eixir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Ix sense alçar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Manquen fitxers"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Comproveu la vostra instal·lació"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "S'està alçant el document..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està alçant la pàgina %d de %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direcció de l'escaneig"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Alçada de la imatge escanejada en píxels"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolució de l'última imatge escanejada"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -747,11 +715,38 @@ msgstr "S'està alçant la pàgina %d de %d"
 #~ "esquerra)."
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "L'alçada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
+#~ "que tenia l'última pàgina escanejada."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
 #~ "(ambdós), «front» (frontal) o «back» (dorsal)"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "La resolució en punts per polzada de la imatge prèviament escanejada."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "L'amplada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
+#~ "que tenia l'última pàgina escanejada."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Amplada de la imatge escanejada en píxels"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Alçada de la finestra en píxels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Amplada de la finestra en píxels"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -776,6 +771,9 @@ msgstr "S'està alçant la pàgina %d de %d"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
 
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
diff --git a/po/cs.po b/po/cs.po
index 2bd5efc..a2df49f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 08:57+0000\n"
-"Last-Translator: Adrian Guniš <andygun696@gmail.com>\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2013-12-18 12:25+0000\n"
+"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizovat"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Vlastní pojmenování zdroje:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotografie"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Přední a zadní"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Přední"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Zadní"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Jednoduché skenování"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_enovat"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Jedna _stránka"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Všechny stránky z _podavače"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Zastavit skenování"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotografie"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Otočit ořez"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Posunout doprava"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Vytvořit nový dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Naskenovat jednu stránku ze skeneru"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skenovat"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Uložit"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Zastavit"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Oříznout vybranou stránku"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Oříznout"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Vlastní pojmenování zdroje:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Heslo:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizovat"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Předvolby"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Zdroj skenování:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Rozlišení textu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Rozlišení fotografie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skenovat stranu:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Velikost stránky:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Jas:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Přední a zadní"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Přední"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Zadní"
+msgid "Quality:"
+msgstr "Kvalita:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Naskenovat dokumenty"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Šířka okna v pixelech"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Výška okna v pixelech"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Zařízení určené ke skenování"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Zařízení SANE pro načítání obrázků."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Typ skenovaného dokumentu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,144 +311,104 @@ msgstr ""
 "Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení skenování, "
 "barvách a následném zpracování."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Směr skenování"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Směr skenování stránky."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Šířka skenovaného obrázku v pixelech"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Šířka skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
-"skenované stránce."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Výška skenovaného obrázku v pixelech"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Výška skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
-"skenované stránce."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Šířka papíru v desetinách milimetru"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Výška papíru v desetinách milimetru"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Výška papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Jas skenu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Nastavení jasu od -100 do 100 (0 žádná hodnota)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Kontrast skenu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Nastavení kontrastu od -100 do 100 (0 žádná hodnota)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Rozlišení posledního skenovaného obrázku"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Rozlišení posledně skenovaného obrázku v bodech na palec."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Rozlišení pro skenování textu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Rozlišení v bodech na palec použité při skenování textu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Rozlišení pro skenování fotografií"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Rozlišení v bodech na palec použité při skenování fotografií."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Strana stránky ke skenování"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Strana stránky ke skenování."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Adresář pro ukládání souborů"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Adresář pro ukládání souborů. Standardně se ukládají do adresáře Dokumenty, "
 "pokud není nastaveno."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Hodnota kvality u JPEG komprese"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Hodnota kvality u JPEG komprese."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Není k dispozici žádný skener. Připojte prosím zařízení."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nelze navázat spojení se skenerem"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nelze zahájit skenování"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Při komunikaci se skenerem došlo k chybě"
 
@@ -502,98 +450,110 @@ msgstr ""
 "Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
 "příkazové řádky."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "Z_avřít"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Pro přístup k '%s' je vyžadováno uživatelské jméno a heslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Uložit jako..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Uložit"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Zvolit _typ souboru"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nezdařilo se uložit obrázek pro náhled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -623,121 +583,141 @@ msgstr ""
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Adrian Guniš https://launchpad.net/~andygun\n"
 "  Jan Hrdina https://launchpad.net/~jan-hrdina\n"
 "  Marv-CZ https://launchpad.net/~marek-manet\n"
+"  Ondra Kadlec https://launchpad.net/~o-kadlec\n"
 "  Petr R. https://launchpad.net/~ateps-r\n"
 "  Petr Šimáček https://launchpad.net/~petr-simacek\n"
+"  Tadeáš Pařík https://launchpad.net/~pariktadeas\n"
 "  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla\n"
 "  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n"
 "  la_serpe https://launchpad.net/~tom-mil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Soubory chybí"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Zkontrolujte prosím svoji instalaci"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Tmavší"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Světlejší"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Méně"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Více"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Výška skenovaného obrázku v pixelech"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Směr skenování"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Výška okna v pixelech"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Šířka okna v pixelech"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Šířka skenovaného obrázku v pixelech"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Rozlišení posledního skenovaného obrázku"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -746,6 +726,16 @@ msgstr "Ukládání strany %d z %d"
 #~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Výška skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
+#~ "skenované stránce."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Rozlišení posledně skenovaného obrázku v bodech na palec."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -754,6 +744,13 @@ msgstr "Ukládání strany %d z %d"
 #~ "fotografie. Toto nastavení rozhoduje o rozlišení skenování, barvách a "
 #~ "následném zpracování."
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Šířka skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
+#~ "skenované stránce."
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -805,3 +802,6 @@ msgstr "Ukládání strany %d z %d"
 #~ msgstr ""
 #~ "Strana stránky ke skenování. Může to být jedna z následujících hodnot: "
 #~ "„both“ (obě), „front“ (přední), „back“ (zadní)"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Směr skenování stránky."
diff --git a/po/da.po b/po/da.po
index eac9b18..ebe03b3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-10-10 12:13+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorisér"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Br_ugernavn for ressource:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Adgangskode:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Billede"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "For- og bagside"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Forside"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Bagside"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simpel skanning"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_an"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Enkelt side"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra _arkføderen"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Stop skanning"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Billede"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Send med e-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotér beskæring"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Indhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Start et nyt dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nyt"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skan en enkelt side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Gem"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotér siden mod venstre (mod uret)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rotér mod venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotér siden mod højre (med uret)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rotér mod højre"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Beskær den markerede side"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Beskær"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Br_ugernavn for ressource:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Adgangskode:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorisér"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Indstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skanner_kilde:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Tekstopløsning:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Billedopløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skan side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "For- og bagside"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Forside"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Bagside"
+msgid "Quality:"
+msgstr "Kvalitet:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skan dokumenter"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Vinduesbredde i pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Vindueshøjde i pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "SAND hvis programvinduet er maksimeret."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Enhed at skanne fra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhed at erhverve billeder fra."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Type af dokument der bliver skannet"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Hvilken slags dokument der skal skannes. Denne indstilling bestemmer "
 "opløsningen, farver og efterbehandling."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Skanneretning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Skannerens retning hen over siden."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Bredde af skannet billede i pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Bredden af skannede billede i pixel. Denne værdi opdateres svarende til "
-"sidste skannede side."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Højde af skannet billede i pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Højden af skannede billede i pixel. Denne værdi opdateres svarende til "
-"sidste skannede side."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Bredde af papir i tiendedele millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,101 +323,93 @@ msgstr ""
 "Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
 "papirstørelse)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Højde af papir i tiendedele millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Højde af papir tiendedele millimeter (eller 0 for automatisk papirstørelse)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Lysstyrke for skanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Lysstyrkejusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Kontrast for skanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Opløsningen af det sidste billede der blev skannet"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Opløsningen i punkter per tomme, på det forrige skannede billede."
+msgstr "Kontrastjusteringen mellem -100 og 100 (hvor 0 betyder ingen)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Opløsning for tekstskan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Opløsningen i punkter per tomme, der skal bruges når der skannes tekst."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Opløsning for billedskan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "Opløsningen i punkter per tomme, der skal bruges når der skannes foto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Papirside der skal skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Hvilken side af papiret der skal skannes."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Mappe til at gemme filer i"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Kvalitetsværdi der bruges til JPEG-komprimering"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Kvalitetsværdi der bruges til JPEG-komprimering."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgængelig. Tilslut en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Kunne ikke forbinde til sḱanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Kunne ikke starte skanning"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Fejl under kommunikation med skanner."
 
@@ -502,98 +450,110 @@ msgstr ""
 "Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
 "kommandolinjetilvalg."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Gem som..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alle filer"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Vælg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme fil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Kan ikke gemme billede for forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Kan ikke åbne hjælpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -622,123 +582,124 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  AJenbo https://launchpad.net/~ajenbo\n"
 "  Aputsiaq Niels Janussen https://launchpad.net/~aj\n"
 "  Ask Hjorth Larsen https://launchpad.net/~askhl\n"
-"  David Nielsen https://launchpad.net/~davidnielsen\n"
+"  David Nielsen https://launchpad.net/~davidnielsen-deactivatedaccount\n"
 "  Joe Hansen https://launchpad.net/~joedalton2\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  MadsRH https://launchpad.net/~madsrh\n"
 "  Marcus Møller https://launchpad.net/~marcusmoller\n"
 "  Niels Kjøller Hansen https://launchpad.net/~kjoller\n"
+"  TLE https://launchpad.net/~k-nielsen81\n"
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Filer mangler"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Kontrollér venligst din installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Mørkere"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Lysere"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Mindre"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Mere"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Skanneretning"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -747,6 +708,22 @@ msgstr "Gemmer side %d ud af %d"
 #~ "følgende: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
 #~ "left\""
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Højde af skannet billede i pixel"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "SAND hvis programvinduet er maksimeret."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Højden af skannede billede i pixel. Denne værdi opdateres svarende til "
+#~ "sidste skannede side."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Opløsningen af det sidste billede der blev skannet"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -756,6 +733,19 @@ msgstr "Gemmer side %d ud af %d"
 #~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver og "
 #~ "efterbehandling."
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Bredden af skannede billede i pixel. Denne værdi opdateres svarende til "
+#~ "sidste skannede side."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Opløsningen i punkter per tomme, på det forrige skannede billede."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Bredde af skannet billede i pixel"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -806,3 +796,12 @@ msgstr "Gemmer side %d ud af %d"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Papirside der skal skannes. Den kan være følgende: 'both' 'front' 'back'"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Vindueshøjde i pixel"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Vinduesbredde i pixel"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Skannerens retning hen over siden."
diff --git a/po/de.po b/po/de.po
index 59fee5e..871d145 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: Daniel Schury <das.surst@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Legitimieren"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Benutzername für Quelle:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Passwort:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Vorder- und Rückseite"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Vorderseite"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Rückseite"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sc_annen"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Einzelne Seite"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle Seiten aus dem _Papiereinzug"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Scanvorgang anhalten"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-Mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4\" × 6\""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Nach links schieben"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "I_nhalt"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Neues Dokument erstellen"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Neu"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Eine einzelne Seite vom Scanner einscannen"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Speichern"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Anhalten"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Links herum drehen"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Die Seite rechts herum drehen (Im Uhrzeigersinn)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rechts herum drehen"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Die gewählte Seite zurechtschneiden"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Benutzername für Quelle:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Passwort:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Legitimieren"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Scan-_Quelle:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Text-Auflösung:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Foto-_Auflösung:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Zu scannende Seite:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Seitengröße:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Qualität:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Vorder- und Rückseite"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Vorderseite"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Rückseite"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Dokumente scannen"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Fensterbreite in Pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Fensterhöhe in Pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE wenn das Anwendungsfenster maximiert ist"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Scangerät"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-Gerät, von dem Bilder angefordert werden."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Typ des zu scannenden Dokuments"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,145 +311,104 @@ msgstr ""
 "Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
 "Auflösung, Farben und Nachbearbeitung."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Scanverzeichnis"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Die Richtung des Scanners über die gescannte Seite."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Breite des gescannten Bilds in Pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Die Breite des gescannten Fotos in Pixeln. Der Wert wird entsprechend der "
-"zuletzt gescannten Seite übernommen."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Höhe des gescannten Bilds in Pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Die Höhe des gescannten Bilds in Pixel. Der Wert wird entsprechend der "
-"zuletzt gescannten Seite übernommen."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Seitenbreite in Zehntelmillimetern"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Papierhöhe in Zehntelmillimetern"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Helligkeit des Scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Kontrast des Scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Auflösung des zuletzt gescannten Bildes"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"Die Auflösung in DPI (Punkte pro Zoll) des zuletzt eingescannten Bildes."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Auflösung von Text-Scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Die für Text zu verwendende Auflösung in DPI (Punkte pro Zoll)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Auflösung von Foto-Scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Zu scannende Seite des Blattes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Die zu scannende Seite."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Das Verzeichnis, in dem die Dateien gespeichert werden. Vorgabe ist das "
 "Dokumente-Verzeichnis, wenn nicht gesetzt."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Qualitätswert für die JPEG-Komprimierung"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Keine Scanner verfügbar. Bitte schließen Sie einen Scanner an."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Verbindung zu Scanner konnte nicht hergestellt werden"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Fehler bei der Kommunikation mit dem Scanner"
 
@@ -504,101 +451,113 @@ msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
 "Befehlszeileoptionen zu erhalten."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "S_chließen"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Speichern unter …"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "Abbre_chen"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Speichern"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Datei-_Typ auswählen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -632,16 +591,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -681,98 +640,95 @@ msgstr ""
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Dateien nicht gefunden"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Bitte überprüfen Sie Ihre Installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -795,6 +751,21 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "  --gtk-module=MODULE            Zusätzliche GTK+-Module laden\n"
 #~ "  --g-fatal-warnings              All Warnungen werden zu fatalen"
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Fensterhöhe in Pixel"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Fensterbreite in Pixel"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Höhe des gescannten Bilds in Pixel"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Scanverzeichnis"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Auflösung des zuletzt gescannten Bildes"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -803,6 +774,30 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "folgenden sein: »Oben nach Unten«, »Unten nach Oben«, »Links nach Rechts« "
 #~ "oder »Rechts nach Links«"
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Die Breite des gescannten Fotos in Pixeln. Der Wert wird entsprechend der "
+#~ "zuletzt gescannten Seite übernommen."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Die Höhe des gescannten Bilds in Pixel. Der Wert wird entsprechend der "
+#~ "zuletzt gescannten Seite übernommen."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE wenn das Anwendungsfenster maximiert ist"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "Die Auflösung in DPI (Punkte pro Zoll) des zuletzt eingescannten Bildes."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Breite des gescannten Bilds in Pixel"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -841,3 +836,6 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "Typ des zu scannenden Dokuments. »text« steht für Textdokumente, »photo« für "
 #~ "Fotos. Die Einstellungen bestimmen die Scan-Auflösung, -Farbe und -"
 #~ "Nachbearbeitung."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Die Richtung des Scanners über die gescannte Seite."
diff --git a/po/el.po b/po/el.po
index 3984aa4..04cd926 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2013-07-03 07:45+0000\n"
 "Last-Translator: John Pag <ioanpagges@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Εξουσιοδότηση"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Όνομα _χρήστη για πόρο:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Κωδικός:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "ΚΕΙΜΕΝΟ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Φωτογραφία"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Πρόσοψη και πίσω όψη"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Πρόσοψη"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Πίσω όψη"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Σάρωση"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Έγγραφο"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "_Σάρωση"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Μια_σελίδα"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Διακοπή σάρωσης"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "ΚΕΙΜΕΝΟ"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Φωτογραφία"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6 ίντσες"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Δημιουργία νέου εγγράφου"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Νέο"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Σάρωση"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Διακοπή"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Περιστροφή της σελίδας αριστερά"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Περιστροφή της σελίδας δεξιά"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Περιστροφή δεξιά"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Περικοπή της επιλεγμένης σελίδας"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Περικοπή"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Όνομα _χρήστη για πόρο:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Κωδικός:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Εξουσιοδότηση"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Πηγή σάρωσης:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Ανάλυση _κειμένου:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Ανάλυση _φωτογραφίας:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Πλευρά σάρωσης"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Μέγεθος σελίδας:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Φωτεινότητα:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Αντίθεση:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Ποιότητα:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Πρόσοψη και πίσω όψη"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Πρόσοψη"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Πίσω όψη"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Σάρωση εγγράφων"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Πλάτος παραθύρου σε εικονοστοιχεία"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Ύψος παραθύρου σε εικονοστοιχεία"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "ΑΛΗΘΕΣ αν το παράθυρο της εφαρμογής είναι μεγιστοποιημένο"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Ο τύπος του εγγράφου που σαρώνεται"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
 "το χρώμα και την μετα-επεξεργασία της σάρωσης."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Κατεύθυνση σάρωσης"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
-"με το πλάτος της τελευταίας σαρωμένης σελίδας."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Ύψος εικόνας σάρωσης σε εικονοστοιχεία"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται με "
-"το ύψος της τελευταίας σαρωμένης σελίδας."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
 "ανίχνευση χαρτιού)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,93 +335,85 @@ msgstr ""
 "Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
 "ανίχνευση χαρτιού)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Φωτεινότητα σάρωσης"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Αντίθεση σάρωσης"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Ανάλυση για σάρωση κειμένου"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Ανάλυση για σάρωση φωτογραφιών"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
 "φωτογραφιών."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Πλευρά σελίδας για σάρωση"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Η πλευρά της σελίδας για σάρωση."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
 "είναι ο κατάλογος εγγράφων."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
@@ -508,100 +456,112 @@ msgstr ""
 "Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
 "εντολής γραμμής."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Ακύρωση"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "Απο_θήκευση"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Επιλογή _τύπου αρχείου"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές θα χαθούν μόνιμα."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -633,16 +593,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -661,98 +621,107 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Λείπουν αρχεία"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Παρακαλούμε ελέγξτε την εγκατάσταση σας"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Περισσότερο"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Ύψος εικόνας σάρωσης σε εικονοστοιχεία"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "ΑΛΗΘΕΣ αν το παράθυρο της εφαρμογής είναι μεγιστοποιημένο"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Κατεύθυνση σάρωσης"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -762,6 +731,29 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα και τη "
 #~ "μετέπειτα επεξεργασία."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Ύψος παραθύρου σε εικονοστοιχεία"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
+#~ "με το πλάτος της τελευταίας σαρωμένης σελίδας."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται με "
+#~ "το ύψος της τελευταίας σαρωμένης σελίδας."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Πλάτος παραθύρου σε εικονοστοιχεία"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -795,6 +787,9 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "(από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) 'right-to-"
 #~ "left' (από δεξιά προς αριστερά)"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -816,3 +811,6 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "  --sync                          Να είναι σύγχρονες οι κλήσεις στο X\n"
 #~ "  --gtk-module=MODULES            Φόρτωση πρόσθετων αρθρωμάτων GTK+\n"
 #~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
diff --git a/po/en_GB.po b/po/en_GB.po
index cbca51d..572cd3e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Authorise"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Username for resource:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Password:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Photo"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Front and Back"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Front"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Back"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sc_an"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Single _Page"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "All Pages From _Feeder"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Stop Scan"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Photo"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_None"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Move Left"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Move Right"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Help"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Contents"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Start a new document"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "New"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Scan a single page from the scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Save"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotate the page to the left (anti-clockwise)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotate the page to the right (clockwise)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Crop the selected page"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Crop"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Username for resource:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Password:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Authorise"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Photo Resolution:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Page Size:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Brightness:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Quality:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Front and Back"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Front"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Back"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Window width (in pixels)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Window height (in pixels)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE if the application window is maximised"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Device to scan from"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE device to acquire images from."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Type of document being scanned"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colours and post-processing."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direction of scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "The direction of the scanner across the scanned page."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Width of scanned image (in pixels)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"The width of scanned image in pixels. This value is updated to the width of "
-"the last image scanned."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Height of scanned image (in pixels)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"The height of scanned image in pixels. This value is updated to the height "
-"of the last image scanned."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Width of paper (in tenths of a mm)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Height of paper (in tenths of a mm)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,88 +335,80 @@ msgstr ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Brightness of scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "The brightness adjustment from -100 to 100 (0 being none)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contrast of scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "The contrast adjustment from -100 to 100 (0 being none)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolution of last scanned image"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "The resolution of the last image scanned (in dots-per-inch)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolution for text scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "The resolution in dots-per-inch to use when scanning text."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolution for photo scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "The resolution in dots-per-inch to use when scanning photos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Page side to scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "The page side to scan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directory to save files to"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "The folder where files are saved. Default is the Documents folder."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Quality value to use for JPEG compression"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Quality value to use for JPEG compression."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No scanners available.  Please connect a scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Unable to connect to scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Error communicating with scanner"
 
@@ -500,98 +448,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Close"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Username and password required to access '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Save As..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Save"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "All Files"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Select File _Type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -620,16 +580,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -642,103 +602,99 @@ msgstr ""
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
 "  Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak\n"
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
-"  Narender Suri https://launchpad.net/~chetan-vidur\n"
 "  Robert Readman https://launchpad.net/~robert-readman\n"
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Files missing"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Please check your installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -769,6 +725,9 @@ msgstr "Saving page %d out of %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Direction of scan"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -776,6 +735,29 @@ msgstr "Saving page %d out of %d"
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE if the application window is maximised"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "The height of scanned image in pixels. This value is updated to the height "
+#~ "of the last image scanned."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolution of last scanned image"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "The width of scanned image in pixels. This value is updated to the width of "
+#~ "the last image scanned."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "The resolution of the last image scanned (in dots-per-inch)."
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -785,6 +767,15 @@ msgstr "Saving page %d out of %d"
 #~ "photos. This determines the scan resolution, colour and post-processing "
 #~ "settings."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Window height (in pixels)"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Window width (in pixels)"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Width of scanned image (in pixels)"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -805,3 +796,9 @@ msgstr "Saving page %d out of %d"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "The direction of the scanner across the scanned page."
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Height of scanned image (in pixels)"
diff --git a/po/eo.po b/po/eo.po
index b8903b5..dbe3b71 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,316 +7,304 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-08-16 11:04+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: eo\n"
 
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "R_ajtigi"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Sal_utnomo por risurco:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Pasvorto:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teksto"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Antaŭo kaj malantaŭo"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Antaŭo"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Dorso"
+
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simpla skano"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokumento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_ani"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Unuopa _paĝo"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Ĉiuj paĝoj el _papero-metilo"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Haltigi _skani"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teksto"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "R_etpoŝto"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Paĝo"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotacii la stoco-lokon"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Helpo"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Enhavo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Komenci novan dokumenton"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nova"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skani unuopan paĝon el la skanilo"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skani"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Konservi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Haltigi la aktualan skanon"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Haltigi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotacii la paĝon maldekstren (maldekstrume)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Turni maldekstren"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotacci la paĝon dekstren (dekstrume)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Turni dekstren"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Stuci la elektitan paĝon"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Stuci"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Sal_utnomo por risurco:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Pasvorto:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "R_ajtigi"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Agordoj"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Fotaĵa distingivo:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skano-flanko:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Paĝo-grando:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Antaŭo kaj malantaŭo"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Antaŭo"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Dorso"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skani dokumentojn"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Fenestro-larĝo en rastrumeroj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Fenestro-alto en rastrumeroj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERA se la apliko-fenestro estas maksimumigita"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "La aparato el kiu skani"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE aparato de kiu akiri bildojn."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Speco de dokumento kiu estas skanata"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -324,145 +312,104 @@ msgstr ""
 "La skanota dokumentspeco. Ĉi tiu agordo difinas la skandistingivon, -"
 "kolorojn kaj -posttraktadon."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direkto de skani"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "La direkto de la skanilo trans la skanota paĝo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Larĝo de skaninta bildo en rastrumeroj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La larĝo de la skanita bildo en rastrumeroj.  Ĉi tiu valoro estas "
-"ĝisdatigita al tion de la paĝo antaŭa."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Alto de skaninta bildo en rastrumeroj"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"La alto de la skanita bildo en rastrumeroj.  Ĉi tiu valoro estas ĝisdatigita "
-"al tion de la paĝo antaŭa."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Larĝo de papero en dekonaj millimetroj"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "La larĝo de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Alto de Papero en dekonaj millimetroj"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "La alto de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Distingivo de bildon skaninta antaŭe"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"La distingivo en punktoj en coloj de la bildo kiu estis skanita antaŭe."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Distingivo por tekstoskanoj"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj teksto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Distingivo por fotoskanoj"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj fotoj."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Paĝoflankon skani"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "La skanota paĝoflanko"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Dosierujo al kiu konservi"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "La dosierujo al kiu konservi dosierojn.  La dokumentoj dosierujo estas la "
 "defaŭlto, se malagordi."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Neniuj skaniloj disponeblaj.  Bonvolu konekti skanilon."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Ne povas konekto kun skanilo"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Ne povas komenci skani"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Eraro kiam konektanta kun skanilo"
 
@@ -502,98 +449,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Lanĉu '%s --help' por vidi plenan liston da disponeblaj komandliniaj opcioj."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Elekti speco de dosieron"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Ne eblas konservi bildon por antaŭrigardo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -623,16 +582,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -645,98 +604,107 @@ msgstr ""
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Dosieroj estas perdiĝantoj"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Bonvolu kontroli vian instalaĵon"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direkto de skani"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Alto de skaninta bildo en rastrumeroj"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Distingivo de bildon skaninta antaŭe"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERA se la apliko-fenestro estas maksimumigita"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -745,11 +713,29 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "malsupren' 'malsupre-supren' 'maldekstre-dekstre' 'dekstre-maldekstren'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "La alto de la skanita bildo en rastrumeroj.  Ĉi tiu valoro estas ĝisdatigita "
+#~ "al tion de la paĝo antaŭa."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "La flanko de paĝo skani.  Povas esti unu el ĉi tiuj: 'ambaŭ' 'antaŭa' "
 #~ "'malantaŭa'"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "La distingivo en punktoj en coloj de la bildo kiu estis skanita antaŭe."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "La larĝo de la skanita bildo en rastrumeroj.  Ĉi tiu valoro estas "
+#~ "ĝisdatigita al tion de la paĝo antaŭa."
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -759,6 +745,15 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "por bildoj.  Ĉi tio agordo decidas pri la distingvo, koloroj kaj "
 #~ "posttraktanta."
 
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Larĝo de skaninta bildo en rastrumeroj"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Fenestro-alto en rastrumeroj"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Fenestro-larĝo en rastrumeroj"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -803,3 +798,6 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "  --sync                          Fari X  pasigoj sinkrona (sinkronigi)\n"
 #~ "  --gtk-module=MODULAJ            Ŝargi suplementaj GTK+ moduloj\n"
 #~ "  --g-fatal-warnings              Fari ĉiujn avertojn neripareblaj"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La direkto de la skanilo trans la skanota paĝo"
diff --git a/po/es.po b/po/es.po
index c8970f8..92cd27b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: Monkey <monkey.libre@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: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Nombre de _usuario para el recurso:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Texto"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Anverso y reverso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Anverso"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Atrás"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Esc_anear"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Una página"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Todas las páginas del _alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "D_etener escaneado"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Texto"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Correo"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Girar a la i_zquierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Contenidos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Crear un documento nuevo"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nuevo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Escanear una sola página desde el escáner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Detiene el escaneado actual"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Detener"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Girar a la izquierda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Girar a la derecha"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Recortar la página seleccionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Recortar"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Nombre de _usuario para el recurso:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Contraseña:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Origen de escaneo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Resolución de _fotografía:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Tamaño de página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Calidad:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Anverso y reverso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Anverso"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Atrás"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Anchura de la ventana en píxeles"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Altura de la ventana en píxeles"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADERO si la ventana de la aplicación está maximizada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Para escanear desde el dispositivo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE desde donde adquirir las imágenes."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipo de documento que está siendo escaneado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Tipo de documento escaneándose. Esta configuración establece la resolución "
 "de escaneo, colores y post-procesamiento."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Dirección de escaneo"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "La dirección del escáner a través de la página escaneada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Anchura de la imagen escaneada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La anchura de la imagen escaneada. Este valor se actualiza con el que tuvo "
-"la última página escaneada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Altura de la imagen escaneada en píxeles"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"La altura de la imagen escaneada. Este valor se actualiza con el que tuvo la "
-"última página escaneada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Anchura del papel en décimas de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,102 +323,93 @@ msgstr ""
 "La anchura del papel en décimas de mm (0 para detección automática del "
 "papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Altura del papel en décimas de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "La altura del papel en décimas de mm (0 para detección automática del papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Brillo de escaneo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste del escaneo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolución de la última imagen escaneada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"La resolución en puntos por pulgada de la imagen escaneada anteriormente."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolución para los escaneados de texto"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La resolución en puntos por pulgada a usar al escanear texto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolución para los escaneados de fotografías"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Cara a escanear de la página"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "El lado de la página a escanear."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directorio en el que guardar los archivos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "El directorio en el que se guardarán los archivos. Por defecto será el "
 "directorio de documentos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Calidad de la compresión de JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Calidad de la compresión de JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hay escáneres disponibles. Conecte un escáner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "No se pudo conectar al escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Incapaz de iniciar el escaneo"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Error comunicándose con el escáner"
 
@@ -494,7 +441,7 @@ msgstr "Documento escaneado"
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:529
 msgid "[DEVICE...] - Scanning utility"
-msgstr "[DEVICE...] - Utilidad de escaneo"
+msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
 #. Text printed out when an unknown command-line argument provided
 #: ../src/simple-scan.vala:540
@@ -504,98 +451,110 @@ msgstr ""
 "Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Documento.pdf escaneado"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Cerrar"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Guardar como…"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Guardar"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Seleccione el _tipo de archivo"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Los cambios se perderán permanentemente si no los guarda."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "No se pudo guardar la imagen para previsualización"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -624,32 +583,31 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A. Emmanuel Mendoza https://launchpad.net/~a.emmanuelmendoza\n"
-"  Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n"
+"  Adolfo Jayme https://launchpad.net/~fitoschido\n"
 "  Antonio Sánchez https://launchpad.net/~antoniosanchez\n"
 "  Carlos Alberto Ospina https://launchpad.net/~atah\n"
 "  Dante Díaz https://launchpad.net/~dante\n"
 "  DiegoJ https://launchpad.net/~diegojromerolopez\n"
 "  Edgardo Fredz https://launchpad.net/~edgardo-fredz\n"
-"  FAMM https://launchpad.net/~famm94\n"
+"  FAMM https://launchpad.net/~famm94-deactivatedaccount\n"
 "  Genesis Bustamante https://launchpad.net/~genmarc\n"
 "  Guillermo RP https://launchpad.net/~guille-arp\n"
 "  Jonay https://launchpad.net/~jonay-santana\n"
 "  Jose Luis Tirado https://launchpad.net/~txelu70\n"
-"  José Luis Ricón https://launchpad.net/~artirj\n"
 "  Julian Alarcon https://launchpad.net/~alarconj\n"
 "  Martin Albisetti https://launchpad.net/~beuno\n"
 "  Monkey https://launchpad.net/~monkey-libre\n"
@@ -666,94 +624,88 @@ msgstr ""
 "  serrador https://launchpad.net/~fserrador"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Faltan archivos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Verifique su instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Más claro"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
@@ -781,6 +733,9 @@ msgstr "Guardando la página %d de %d"
 #~ "  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
 #~ "  --g-fatal-warnings              Hacer que todos los avisos sean fatales"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -789,6 +744,12 @@ msgstr "Guardando la página %d de %d"
 #~ "Uso:\n"
 #~ "  %s [DISPOSITIVO...] - utilidad de escaneo"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Dirección de escaneo"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Altura de la imagen escaneada en píxeles"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -797,6 +758,29 @@ msgstr "Guardando la página %d de %d"
 #~ "cualquiera de los siguientes: 'top-to-bottom' 'bottom-to-top' 'left-to-"
 #~ "right' 'right-to-left'"
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "La anchura de la imagen escaneada. Este valor se actualiza con el que tuvo "
+#~ "la última página escaneada"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo la "
+#~ "última página escaneada"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Anchura de la imagen escaneada"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Altura de la ventana en píxeles"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Anchura de la ventana en píxeles"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -813,6 +797,16 @@ msgstr "Guardando la página %d de %d"
 #~ "  --help-all                      Muestra todas las opciones de ayuda\n"
 #~ "  --help-gtk                      Muestra opciones de GTK+"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERDADERO si la ventana de la aplicación está maximizada"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolución de la última imagen escaneada"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "La resolución en puntos por pulgada de la imagen escaneada anteriormente."
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -827,3 +821,6 @@ msgstr "Guardando la página %d de %d"
 #~ msgstr ""
 #~ "La cara a escanear de la página. Puede ser uno de los siguientes: «ambas», "
 #~ "«anverso» o «reverso»."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La dirección del escáner a través de la página escaneada."
diff --git a/po/et.po b/po/et.po
index cd008cb..85bfd11 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,457 +7,405 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autoriseeri"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Kasutajanimi allika jaoks:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Parool:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Esi- ja tagakülg"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Esikülg"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Tagakülg"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Lihtne skannija"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_annimine"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Üks _lehekülg"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Kõik lehed _söötjast"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Lõpeta skannimine"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Kärbi"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Puudub"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4 x 6 tolli"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Kohandatud"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Pööramisega kärbe"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "A_bi"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Sisu"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Uue dokumendi alustamine"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Uus"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Ühe lehekülje skannimine skannerist"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skanni"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Salvesta"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Selle skannimise lõpetamine"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Lõpeta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Lehekülje pööramine vasakule (vastupäeva)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Vasakule pööramine"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Lehekülje pööramine paremale (päripäeva)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Paremale pööramine"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Valitud lehekülje kärpimine"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Kärbi"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Kasutajanimi allika jaoks:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Parool:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autoriseeri"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Eelistused"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Teksti eraldusvõime:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Foto eraldusvõime:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Slaidi skannimine:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Lehekülje suurus:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Esi- ja tagakülg"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Esikülg"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Tagakülg"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Dokumentide skannimine"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Akna laius pikslites"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Akna kõrgus pikslites"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Tõene, kui rakenduse aken on maksimeeritud"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Seade, millest skannida"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-seade, millest pilte hankida."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Skannitava dokumenti tüüp"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Skannimise suund"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Skannitud pildi laius pikslites"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Skannitud piltide laius pikslites. Väärtust uuendatakse vastavalt viimati "
-"skannitud lehele."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Skannitud piltide kõrgus pikslites"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Skannitud pildi kõrgus pikslites. Seda väärtust uuendatakse vastavalt "
-"viimati skannitud lehele."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Paberi laius kümnendikmillimeetrites"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "Paberi laius kümnendikmillimeetrites (automaatseks tuvastuseks 0)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Paberi kõrgus kümnendikmillimeetrites"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Paberi kõrgus kümnendikmillimeetrites (paberi automaatseks tuvastamiseks 0)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Viimase skannitud pildi eraldusvõime"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Viimati skannitud pildi eraldusvõime, ühik on punkti tolli kohta."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Tekstiskannide eraldusvõime"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Teksti skannimisel kasutatav lahutus, punktides tolli kohta."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Fotoskannide eraldusvõime"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Piltide skannimisel kasutatav lahutus, punktides tolli kohta."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Skannitav lehe külg"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Kataloog, kuhu failid salvestada"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Kataloog, kuhu failid salvestada. Kui määramata, on vaikeväärtus dokumentide "
 "kataloog."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Skannereid pole saadaval. Palun ühenda skanner arvutiga."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Skanneriga ei suudetud ühenduda"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Skannimist ei suudetud alustada"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Tõrge skanneriga suhtlemisel"
 
@@ -496,98 +444,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Käivita '%s --help', et näha kõiki käsurea valikuid."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ligipääsuks on vajalik kasutajanimi ja parool"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Pildifailid"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Kõik failid"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Vali faili _tüüp"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (mitmeleheküljeline dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Kui sa ei salvesta, lähevad muudatused jäädavalt kaotsi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -617,16 +577,16 @@ msgstr ""
 "<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -635,98 +595,107 @@ msgstr ""
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Puuduvad failid"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Palun kontrolli paigaldust"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4 x 6 tolli"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Skannitud piltide kõrgus pikslites"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Tõene, kui rakenduse aken on maksimeeritud"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Skannimise suund"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Viimase skannitud pildi eraldusvõime"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -744,6 +713,32 @@ msgstr ""
 #~ "fotode jaoks. See säte määrab skannimise eraldusvõime, värvid ja "
 #~ "järeltöötluse."
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Skannitud piltide laius pikslites. Väärtust uuendatakse vastavalt viimati "
+#~ "skannitud lehele."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Skannitud pildi kõrgus pikslites. Seda väärtust uuendatakse vastavalt "
+#~ "viimati skannitud lehele."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Viimati skannitud pildi eraldusvõime, ühik on punkti tolli kohta."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Skannitud pildi laius pikslites"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Akna kõrgus pikslites"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Akna laius pikslites"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
diff --git a/po/eu.po b/po/eu.po
index 3cee432..d03ba2a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 08:59+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2014-03-11 21:02+0000\n"
+"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Baimendu"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Erabiltzaile-izena baliabiderako:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Pasahitza:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Testua"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Argazkia"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Aurrealdea eta atzealdea"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Aurrealdea"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Atzealdea"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokumentua"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Es_kaneatu"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Orrialde bakarra"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "_Elikagailuko orri guztiak"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Gelditu eskaneatzea"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Testua"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Argazkia"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Posta elektronikoa"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Moztu"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Bat ere ez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "AEBetako gutuna"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "AEBetako le_gala"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Pertsonalizatua"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Biratu mozketa"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Laguntza"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Edukiak"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Hasi dokumentu berria"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Berria"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Eskaneatu eskanerreko orrialde bakarra"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Eskaneatu"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Gorde"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Gelditu"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Biratu ezkerrera"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Biratu orrialdea eskuinra (erlojuaren noranzkoan)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Biratu eskuinera"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Moztu hautatutako orrialdea"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Moztu"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Erabiltzaile-izena baliabiderako:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Pasahitza:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Baimendu"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Hobespenak"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Eskaneatze-_jatorria:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Testu-bereizmena:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Ar_gazki-bereizmena:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Eskaneatze-aldea:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Orrialde-tamaina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Distira:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrastea:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kalitatea:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Aurrealdea eta atzealdea"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Aurrealdea"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Atzealdea"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Eskaneatu dokumentuak"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Leihoaren zabalera pixeletan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Leihoaren altuera pixeletan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE aplikazio-leihoa maximizatuta badago"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Eskaneatze-gailua"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Eskaneatuko den dokumentu-mota"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
 "koloreak eta posprozesatzea finkatzen du."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Eskaneatzearen noranzkoa"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Eskanerraren zentzua eskaneatutako orrian zehar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Eskaneatutako irudiaren zabalera pixeletan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Eskaneatutako irudiaren zabalera pixeletan. Parametro hau eskaneatutako "
-"azken orrialdearen baliora eguneratzen da."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Eskaneatutako irudiaren altuera pixeletan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako azken "
-"orrialdearen baliora eguneratzen da."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Paperaren zabalera mm hamarrenetan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
 "detekzio automatikorako)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Paperaren altuera mm hamarrenetan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,90 +335,82 @@ msgstr ""
 "Eskaneatutako paperaren altuera milimetro hamarrenetan (edo 0 paperaren "
 "detekzio automatikorako)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Eskanerraren distira"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Distiraren doiketa, -100etik 100era (0 = distirarik ez)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Eskanerraren kontrastea"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Eskaneatutako azken irudiaren bereizmena"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
+msgstr "Kontrastearen doiketa, -100etik 100era (0 = kontrasterik ez)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Bereizmena testuen eskaneatzerako"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Bereizmena argazkien eskaneatzerako"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Eskaneatuko den aldea"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Eskaneatuko den orrialdea."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Fitxategiak gordetzeko direktorioa"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
 "lehenetsia dokumentuen direktorioa da."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Kalitatearen balioa, JPEG konpresioan erabiltzeko."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ez dago eskanerrik erabilgarri. Mesedez, konektatu eskaner bat."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Ezin da eskanerrarekin konektatu"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Ezin da eskanerra abiarazi"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Errorea eskanerrarekin komunikatzean"
 
@@ -502,98 +450,110 @@ msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Dokumentu.pdf eskaneatuta"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Itxi"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Gorde honela..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Gorde"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Hautatu fit_xategi-mota"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Ezin izan da fitxategia gorde"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Ezin izan da aurrebistarako irudia gorde"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -622,16 +582,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -646,98 +606,101 @@ msgstr ""
 "  Xabier Isla Rodriguez https://launchpad.net/~xabier.isla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Fitxategiak falta dira"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Egiaztatu instalazioa"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Ilunago"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Argiago"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Gutxiago"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Eskaneatutako irudiaren altuera pixeletan"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Eskaneatutako azken irudiaren bereizmena"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -754,6 +717,9 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "izan daiteke: 'goitik behera' 'behetik gora' 'ezkerretik eskuinera' "
 #~ "'eskuinetik ezkerrera'"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE aplikazio-leihoa maximizatuta badago"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
@@ -761,6 +727,20 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "'atzealdea'"
 
 #~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Eskaneatutako irudiaren zabalera pixeletan. Parametro hau eskaneatutako "
+#~ "azken orrialdearen baliora eguneratzen da."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako azken "
+#~ "orrialdearen baliora eguneratzen da."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -769,6 +749,18 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, koloreak "
 #~ "eta post-tratamendua finkatzen du."
 
+#~ msgid "Window width in pixels"
+#~ msgstr "Leihoaren zabalera pixeletan"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Leihoaren altuera pixeletan"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Eskaneatutako irudiaren zabalera pixeletan"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -804,3 +796,9 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "  -h, --help Erakutsi laguntza-aukerak\n"
 #~ "  --help-all Erakutsi laguntza-aukera guztiak\n"
 #~ "  --help-gtk erakutsi GTK+ aukerak"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Eskaneatzearen noranzkoa"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Eskanerraren zentzua eskaneatutako orrian zehar."
diff --git a/po/fi.po b/po/fi.po
index ca0284f..6aa3304 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-23 05:24+0000\n"
-"X-Generator: Launchpad (build 16771)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Valtuuta"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Resurssin _käyttäjänimi:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teksti"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Valokuva"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Etu- ja takapuoli"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Etupuoli"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Takapuoli"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Kuvanluku"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Asiakirja"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Lue kuv_a"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Yksi _sivu"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Kaikki sivut _laitteelta"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Py_säytä kuvanluku"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teksti"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Valokuva"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Sähköposti"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "Kierrä rajausta"
+msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "O_hje"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Sisältö"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Aloita uusi asiakirja"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Uusi"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Lue yksi sivu kuvanlukijalta"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Lue"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Tallenna"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Pysäytä"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Kierrä sivua vasemmalle (vastapäivään)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Kierrä vasemmalle"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Kierrä sivua oikealle (myötäpäivään)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Kierrä oikealle"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Rajaa nykyistä sivua"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Rajaa"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Resurssin _käyttäjänimi:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Salasana:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Valtuuta"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Lue lähtee_stä:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Tekstin tarkkuus:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Valokuvan tarkkuus:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Luettava puoli:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sivun koko:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Kirkkaus:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Laatu:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Etu- ja takapuoli"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Etupuoli"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Takapuoli"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Lue asiakirjoja kuvanlukijalta"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Ikkunan leveys pikseleinä"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Ikkunan korkeus pikseleinä"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Arvo TOSI, jos sovelluksen ikkuna on suurennettu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Laite jolta luetaan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-laite jolta kuvat luetaan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Luettavan asiakirjan tyyppi"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
 "jälkiprosessoinnin."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Lukemisen suunta"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Luettavan kuvan leveys pikseleinä"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Skannattavan kuvan leveys pikseleinä. Arvo päivittyy viimeksi skannatun "
-"sivun mukaan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Luetun kuvan korkeus pikseleissä"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun sivun "
-"mukaan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Paperin leveys kymmenesosamilleinä"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Paperin leveys kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
 "varten)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Paperin pituus kymmenesosamilleinä"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,89 +335,81 @@ msgstr ""
 "Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
 "varten)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Kuvanluvun kirkkaus"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Kuvanluvun kontrasti"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Viimeisimmän luetun kuvan tarkkuus"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Viimeksi skannatun kuvan resoluutio pisteinä tuumaa kohti."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Tarkkuus tekstin lukemiseen"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Tarkkuus valokuvien luvulle"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Skannattava puoli"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Skannattavan sivun puoli."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Kansio, johon tiedostot tallennetaan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Kuvanlukijaan ei voi yhdistää"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
@@ -500,98 +448,110 @@ msgstr "[LAITE...] - Skannaus apuohjelma"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Sulje"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Peru"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Tallenna"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Valitse tiedosto_tyyppi"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -622,16 +582,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -646,98 +606,95 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
-msgstr "Tallennetaanko asiakirja ennen ohjelman sulkemista?"
+msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Tiedostoja puuttuu"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Tarkista asennuksesi tila"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Tummempi"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Vähemmän"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Enemmän"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Parempi"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -758,6 +715,24 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --gtk-module=MODUULIT           Lataa lisäksi GTK+-moduulit\n"
 #~ "  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Lukemisen suunta"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Luetun kuvan korkeus pikseleissä"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Viimeisimmän luetun kuvan tarkkuus"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Ikkunan korkeus pikseleinä"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Ikkunan leveys pikseleinä"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Arvo TOSI, jos sovelluksen ikkuna on suurennettu"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -767,6 +742,23 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  %s [LAITE...] - Kuvanlukutyökalu"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun sivun "
+#~ "mukaan."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Luettavan kuvan leveys pikseleinä"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Skannattavan kuvan leveys pikseleinä. Arvo päivittyy viimeksi skannatun "
+#~ "sivun mukaan."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "Skannattava puoli. Mahdollisia valintoja ovat: molemmat, etu ja taka"
 
@@ -795,6 +787,9 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "  --help-all Näytä kaikki apuvalinnat\n"
 #~ "  --help-gtk Näytä kaikki GTK+-valinnat"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Viimeksi skannatun kuvan resoluutio pisteinä tuumaa kohti."
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -802,3 +797,6 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ "Skannerin suunta skannatun sivun yli. Se voi olla jokin seuraavista: 'top-to-"
 #~ "bottom' 'bottom-to-top' 'left-to-right' 'right-to-left' ('ylhäältä alas' "
 #~ "'alhaalta ylös' 'vasemmalta oikealle' 'oikealta vasemmalle')"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
diff --git a/po/fr.po b/po/fr.po
index 287a8d4..e658044 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,316 +7,304 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-09-27 21:23+0000\n"
 "Last-Translator: 65GYgzf <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: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Utilisateur :"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Texte"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Photo"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Recto verso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Recto"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Outil de numérisation Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Nu_mériser"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Page unique"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Toutes les pages du _bac"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Arrêter la numérisation"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Texte"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Photo"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Pivote_r la selection"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Déplacer à gauche"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Déplacer à droite"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Contenus"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Créer un nouveau document"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nouveau"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Numériser une seule page depuis le scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Enregistrer"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Arrêter la numérisation en cours"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Arrêter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 "Pivoter la page vers la gauche (sens inverse des aiguilles d'une montre)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Pivoter vers la gauche"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pivoter la page vers la droite (sens des aiguilles d'une montre)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Pivoter vers la droite"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Recadrer la page sélectionnée"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Recadrer"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Utilisateur :"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Mot de passe :"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autoriser"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Préférences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "S_ource de numérisation :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Résolution pour le _texte :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Résolution pour la _photo :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Face à numériser :"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Taille de page :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Luminosité :"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Qualité :"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Recto verso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Recto"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Verso"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Largeur de la fenêtre en pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Hauteur de la fenêtre en pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VRAI si la fenêtre de l'application est maximisée"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Numériser depuis"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Nature du document qui va être numérisé"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -324,43 +312,11 @@ msgstr ""
 "Type de document numérisé. Ce réglage définit la résolution de numérisation, "
 "les couleurs et le post-traitement."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Sens de numérisation"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Le sens du scanner par rapport à la page numérisée."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Largeur de l'image numérisée en pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La largeur de l'image numérisée en pixels. Cette valeur est mise à jour en "
-"fonction de la dernière page numérisée."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Hauteur de l'image numérisée en pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"La hauteur de l'image numérisée en pixels. Cette valeur est mise à jour en "
-"fonction de la dernière page numérisée."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Largeur du papier en dixièmes de mm."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -368,11 +324,11 @@ msgstr ""
 "La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
 "du papier)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Hauteur du papier en dixièmes de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -380,95 +336,87 @@ msgstr ""
 "La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
 "du papier)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Luminosité de la numérisation"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Ajustement de la luminosité de -100 à 100 (0 pour aucun)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste de la numérisation"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Ajustement du contraste de -100 à 100 (0 pour aucun)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Résolution de la dernière image numérisée"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "La résolution de la dernière image numérisée en points par pouce."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Résolution des numérisations de textes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "La résolution en points par pouce à utiliser lors de la numérisation de "
 "texte."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Résolution des numérisations de photos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "La résolution en points par pouce à utiliser lors de la numérisation de "
 "photos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Face(s) de la page à numériser"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Le côté de la page à numériser."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Dossier dans lequel les fichiers sont enregistrés"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Le dossier où les fichiers sont enregistrés. S'il n'est pas défini, le "
 "dossier documents sera utilisé par défaut."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Taux de qualité à utiliser pour la compression JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Taux de qualité à utiliser pour la compression JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Aucun périphérique de numérisation disponible. Veuillez en connecter un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connecter au scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Erreur de communication avec le scanner"
 
@@ -510,99 +458,111 @@ msgstr ""
 "Exécutez « %s --help » pour voir la liste complète des options disponibles "
 "en ligne de commande."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numérisé"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Fermer"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Aucun scanner n'a été détecté."
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Veuillez vérifier que votre scanner est connecté et sous tension."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Enregistrer sous…"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Sauvegarder"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Fichiers images"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Sélectionnez le _type de fichier"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multi-pages)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Impossible d'ouvrir l'aperçu de l'image"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -632,16 +592,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,7 +610,7 @@ msgstr ""
 "  Alexandre Pliarchopoulos https://launchpad.net/~al-pliar\n"
 "  Antoine Pernot https://launchpad.net/~antoinepernot\n"
 "  Audiger Jeremy https://launchpad.net/~tankypon\n"
-"  Bruno Patri https://launchpad.net/~bruno666\n"
+"  Bruno Patri https://launchpad.net/~bruno666-deactivatedaccount\n"
 "  Christophe Herot https://launchpad.net/~tictoc-free\n"
 "  Darknautilus https://launchpad.net/~darknautilus\n"
 "  David Bosman https://launchpad.net/~david-bosman\n"
@@ -666,6 +626,7 @@ msgstr ""
 "  Nicolas Delvaux https://launchpad.net/~malizor\n"
 "  Olivier Febwin https://launchpad.net/~febcrash\n"
 "  Ozouli.SaLeH https://launchpad.net/~ouzouli\n"
+"  Pascal Maugendre https://launchpad.net/~pmaugendre\n"
 "  Paul Forget https://launchpad.net/~paul92\n"
 "  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
 "  RemiJ https://launchpad.net/~remij\n"
@@ -677,100 +638,93 @@ msgstr ""
 "  YannUbuntu https://launchpad.net/~yannubuntu\n"
 "  beudbeud https://launchpad.net/~beudbeud\n"
 "  blackbg https://launchpad.net/~corentin-cadiou\n"
-"  claude-Emile https://launchpad.net/~ch370648\n"
 "  loic08 https://launchpad.net/~loic08\n"
 "  londumas https://launchpad.net/~helion331990\n"
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (haute résolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Fichiers manquants"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Veuillez vérifier votre installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Changer de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Enregistrement du document…"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
@@ -805,6 +759,38 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ "  --gtk-module=MODULES Charger des modules GTK+ supplémentaires\n"
 #~ "  --g-fatal-warnings Rendre tous les avertissements fatals"
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Hauteur de la fenêtre en pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Largeur de la fenêtre en pixels"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VRAI si la fenêtre de l'application est maximisée"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "La hauteur de l'image numérisée en pixels. Cette valeur est mise à jour en "
+#~ "fonction de la dernière page numérisée."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "La largeur de l'image numérisée en pixels. Cette valeur est mise à jour en "
+#~ "fonction de la dernière page numérisée."
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Hauteur de l'image numérisée en pixels"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Résolution de la dernière image numérisée"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Sens de numérisation"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -829,6 +815,12 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ "être : de haut en bas ; de bas en haut ; de gauche à droite ; de droite à "
 #~ "gauche"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "La résolution de la dernière image numérisée en points par pouce."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Largeur de l'image numérisée en pixels"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -843,3 +835,9 @@ msgstr "Enregistrement de la page %d sur %d"
 #~ msgstr ""
 #~ "La ou les faces de la page à numériser. Cela peut être au choix : « Recto "
 #~ "verso », « Recto » ou « Verso »"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Le sens du scanner par rapport à la page numérisée."
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
diff --git a/po/gd.po b/po/gd.po
index a6bded6..9544a15 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,466 +7,420 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "Ùg_hdarraich"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_An t-ainm-cleachdaiche airson a' ghoireis:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Facal-faire:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teacsa"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Dealbh"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "A h-aghaidh 's a cùl"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "A h-aghaidh"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "A cùl"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
-msgstr "Sgana Simplidh"
+msgstr "Sganadh simplidh"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Sgrìobhainn"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sg_anaich"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
-msgstr "Singilte _Duilleag"
+msgstr "_Duilleag shingilte"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
-msgstr "H-uile duilleag Bhon _Biathaiche"
+msgstr "Gach duilleag a tha san _bhiathadair"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
-msgstr "_Stad Sganaich"
-
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teacsa"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Dealbh"
+msgstr "Cuir _stad air an sganadh"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
-msgstr "_Postd"
+msgstr "_Post-d"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Duilleag"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
-msgstr "Cuairtich _Clì"
+msgstr "Cuairtich gu _tuathail"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
-msgstr "Cuairtich _Deas"
+msgstr "Cuairtich gu _deiseil"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
-msgstr "_Buain"
+msgstr "_Bearr"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
-msgstr "_Neoni"
+msgstr "Cha_n eil gin"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Litir"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
-msgstr "La_ghail"
+msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
-msgstr "_Gnàths"
+msgstr "_Gnàthaichte"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "_Cuairtich Buain"
+msgstr "_Cuairtich an raon bearraidh"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr "Gluais Clì"
+msgstr "Gluais gun taobh chlì"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr "Gluais Deas"
+msgstr "Gluais gun taobh deas"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Cobhair"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Clàr-innse"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
-msgstr "Tòisich sgrìobhainn ùr"
+msgstr "Tòisich air sgrìobhainn ùr"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Ùr"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
-msgstr "Sganaich duilleag singilte bhon sganair"
+msgstr "Sganaich duilleag shingilte on sganair"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Sganaich"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
-msgstr "Sàbhail sgrìobhainn gu faidhle"
+msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Sàbhail"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
-msgstr "Stad an sgana làithreach"
+msgstr "Cuir stad air an sganadh làithreach"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stad"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Cuairtich clì an duilleag (tuathal)"
+msgstr "Cuairtich an duilleag gu tuathail"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
-msgstr "Cuairtich Clì"
+msgstr "Cuairtich gu tuathail"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
-msgstr "Cuairtich deas an duilleag (deasail)"
+msgstr "Cuairtich an duilleag gu deiseil"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
-msgstr "Cuairtich Deas"
+msgstr "Cuairtich gu deiseil"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
-msgstr "Buain an duilleag taghta"
+msgstr "Bearr an duilleag a thagh thu"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
-msgstr "Buain"
-
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Ainm-cleachdaiche son goireas:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Facal faire:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Ùghdarraich"
+msgstr "Bearr"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Roghainnean"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
-msgstr "Sgana B_un-tùs:"
+msgstr "Tùs an _sganaidh:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr "_Teacsa Dùmhlachd-Bhreacaidh:"
+msgstr "_Dùmhlachd-bhreacaidh an teacsa:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
-msgstr "_Dealbh Dùmhlachd-Bhreacaidh:"
+msgstr "_Dùmhlachd-bhreacaidh an deilbh:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
-msgstr "Sgana Taobh:"
+msgstr "Sganaich taobh:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
-msgstr "Meud Duilleag:"
+msgstr "Meud na duilleige:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Soilleireachd:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Iomsgaradh:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Beulaibh agus Cùlaibh"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Beulaibh"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Air ais"
+msgid "Quality:"
+msgstr "Càileachd:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
-msgstr "Sganaich Sgrìobhainn"
+msgstr "Sganaich sgrìobhainnean"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Leud uinneag ann am piosgailean"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Àirde uinneag ann am piosgailean"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "FÌOR ma tha uinneag a'phrògram tur-àrdachadh"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
-msgstr "Innleachd do sganaich bho"
+msgstr "An t-uidheam a nì an sganadh"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
-msgstr "Innleachd SANE son faighinn ìomhaighean bho."
+msgstr "An t-uidheam SANE a gheibhear na h-ìomhaighean uaithe."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
-msgstr "A seòrsa sgrìobhainn ga sganadh"
+msgstr "Seòrsa na sgrìobhainne a tha 'ga sganadh"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
-"A seòrsa sgrìobhainn ga sganadh. Tha suidheachadh seo rèiticheadh dùmhlachd-"
-"bhreacaidh air a sgana, dathan agus an dèidh-giullachd."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "A' chùrsa sgana"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Cùrsa a sganair tharis an duilleag tha sganadh."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Leud den sganadh ìomhaigh ann am piosgailean"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A leud den sganadh ìomhaigh ann am piosgailean. Tha luach seo ùrachadh gu an "
-"sganadh duilleag\r\n"
-"mu dheireadh."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Àirde den sganadh ìomhaigh ann am piogsailean"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Àirde sganadh den ìomhaigh ann an piogsailean. Tha luach seo ùrachadh gu an "
-"sganadh duilleag mu dheireadh."
+"Seòrsa na sgrìobhainne a tha 'ga sganadh. Tha an roghainn seo a' "
+"suidheachadh dùmhlachd-bhreacaidh, dathan agus iar-ghiullachd an sgana."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
-msgstr "Leud am pàipear ann a deicheamhaich de mm"
+msgstr "Leud a' phàipeir ann an deicheamhan de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"leud am pàipear ann a deicheamhaich de mm (no 0 son lorg-paipear fèin-"
-"obrachail)."
+"Leud a' phàipeir ann an deicheamhan de mm (no 0 airson mothachadh fèin-"
+"obrachail do leud a' phàipeir)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
-msgstr "Àirde am paipear ann a deicheamhaich de mm"
+msgstr "Àirde a' phàipeir ann an deicheamhan de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Àirde am paipear ann deicheamhaich de mm (no 0 son lorg-paipear fèin-"
-"obrachail)."
+"Àirde a' phàipeir ann an deicheamhan de mm (no 0 airson mothachadh fèin-"
+"obrachail do dh'àirde a' phàipeir)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Soilleireachd an sgana"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
+"Socrachadh na soilleireachd eadar -100 agus 100 ('s ciall dha 0 nach bi gin "
+"ann)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Iomsgaradh an sgana"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
+"Socrachadh an iomsgaraidh eadar -100 agus 100 ('s ciall dha 0 nach bi gin "
+"ann)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Dùmhlachd-bhreacaidh ìomhaigh air sganaich mu dheireadh"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"Dùmhlachd-bhreacaidh ann a dotagan-gach-diog de sganadh ìomhaigh mar-tha."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
-msgstr "Dùmhlachd-bhreacaidh son sganaichean teacsa"
+msgstr "An dùmhlachd-bhreacaidh airson sganadh teacsa"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Dùmhlachd-bhreacaidh ann a dotagan-gach-diog nuair sganadh teacsa."
+msgstr ""
+"Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, a chleachdar airson "
+"sganadh teacsa."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
-msgstr "Dùmhlachd-bhreacaidh son sganaichean dealbh"
+msgstr "An dùmhlachd-bhreacaidh airson sganadh dhealbhan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Dùmhlachd-bhreacaidh ann a dotagan-gach-diog nuair sganadh dealbhan."
+msgstr ""
+"Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, a chleachdar airson "
+"sganadh dhealbhan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
-msgstr "Taobh duilleag ri sganaich"
+msgstr "Dè taobh na duilleige a tha ri sganadh"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
-msgstr "An taobh duilleag a sganadh."
+msgstr "Dè taobh na duilleige a tha ri sganadh."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
-msgstr "Eòlaire do shàbhail faidhlichean gu"
+msgstr "Am pasgan san dèid na faidhlichean a shàbhaladh ann"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"An eòlaire gu sàbhail faidhlichean do. Gnàthachadh gu eòlaire na "
-"sgrìobhainnean ma seadha 's nach eil e stèidhichte."
+"Am pasgan san dèid na faidhlichean a shàbhaladh ann. Thèid an sàbhaladh ann "
+"am pasgan nan sgrìobhainnean a ghnàth mur an deach seo atharrachadh."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Ìre na càileachd a thèid a chleachdadh airson dùmhlachdh JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Gun sganairean ri làimh, Ceangal sibh sganair."
+msgstr "Chan eil sganair sam bith ri làimh. Feuch is ceangail sganair ris."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
-msgstr "Cha b'urrain ceangal gu sganair."
+msgstr "Cha b' urrainn dhuinn ceangal ris an sganair."
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
-msgstr "Cha b'urrain tòiseachadh sgana"
+msgstr "Cha b' urrainn tòiseachadh air an sganadh"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
-msgstr "Mearachd rùn-phàirteachadh le sganair"
+msgstr "Thachair mearachd nuair a bha sinn a' conaltradh ris an sganair"
 
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
@@ -476,127 +430,144 @@ msgstr "Seall tionndadh an sgaoilidh"
 #. Help string for command line --debug flag
 #: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr "Clò-bhuail teachdaireachdan dì-bhugachadh"
+msgstr "Clò-bhuail teachdaireachdan dì-bhugachaidh"
 
 #: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
-"Càirich faidhlichean PDF chrùthachadh le tionndaidhean aosda de Simple Scan"
+"Càirich faidhlichean PDF a chaidh a chruthachadh le seann-tionndaidhean de "
+"Simple Scan"
 
 #. Title of error dialog when scan failed
 #: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr "D'fhàilig a sganadh"
+msgstr "Dh'fhàillig an sganadh"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr "Sganadh Sgrìobhainn"
+msgstr "Sgrìobhainn sganaichte"
 
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:529
 msgid "[DEVICE...] - Scanning utility"
-msgstr "[Innleachd...] - Goireas Sganadh"
+msgstr "[DEVICE...] - Goireas sganaidh"
 
 #. Text printed out when an unknown command-line argument provided
 #: ../src/simple-scan.vala:540
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Ruith '%s --help' son faicinn làn liosta roghainnean loidhne-àithne ri làimh."
+"Ruith \"%s --help\" airson liosta shlàn dhe na roghainnean command line a "
+"tha ri làimh fhaicinn."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
-msgstr "Sganadh Sgrìobhainn.pdf"
+msgstr "Sgrìobhainn sganaichte.pdf"
+
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Dùin"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "Ainm-cleachdaiche agus facal-faire iarrtas ruigsinneachd '%s'"
+msgstr ""
+"Tha feum air ainm-cleachdaiche agus facal-faire mus faighear cothrom air "
+"\"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
-msgstr "Gun sganairean air lorg"
+msgstr "Cha deach sganair sam bith a lorg"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
-msgstr "Sgrùd sibh gu bheil sganair agaibh ceangailt agus a' chumhachd air"
+msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
-msgstr "Sàbhail Mar..."
+msgstr "Sàbhail mar..."
+
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Sguir dheth"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Sàbhail"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
-msgstr "Faidhlichean Ìomhaigh"
+msgstr "Faidhlichean deilbh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
-msgstr "Faidhlichean gu lèir"
+msgstr "Na h-uile faidhle"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
-msgstr "Tagh Faidhle _Seòrsa"
+msgstr "Tagh _seòrsa an fhaidhle"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
-msgstr "PDF {sgrìobhainn ioma-duilleag}"
+msgstr "PDF {sgrìobhainn ioma-dhuilleagach}"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
-msgstr "JPEG (peinntealta)"
+msgstr "JPEG (dùmhlaichte)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
-msgstr "PNG (lossless)"
+msgstr "PNG (gun chall càileachd)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
-msgstr "D'fhàilig sàbhail gu faidhle"
+msgstr "Cha b' urrainn dhuinn a shàbhaladh ann am faidhle"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
-msgstr "Mar 's e nach sàbhail thu, chailleadh atharraichean gu maireannach."
+msgstr ""
+"Mur an sàbhail thu e, thèid atharrachadh sam bith a rinn thu air chall."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
-msgstr "Sàbhail sgrìobhainn làithreach?"
+msgstr "A bheil thu airson an sgrìobhainn làithreach a shàbhaladh?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
-msgstr "Tilg às atharraichean"
+msgstr "Tilg air falbh na h-atharraichean"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
-msgstr "Cha b'urrain sàbhail ìomhaigh airson ro-shealladh"
+msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
-msgstr "Cha b'urrain fosgail prògram ro-shealladh ìomhaigh"
+msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
-msgstr "Cha b`urrain fosgail faidhle cobhair"
+msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -611,126 +582,166 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"Prògram bathar-bog saorsail tha seo: Faodaidh tu sgaoileadh e agus/no "
-"atharraich \n"
-"e fo teirmichean Ceadachas Poblach Coitcheann GNU mar dh'foillsicheadh le\n"
-"Fonndas Bathar-bog Saorsail (FSF) an dàrna cuid dreachd 3 den Ceadachas, no\n"
-"(do thaghadh fhèin) dreachd sam bith nas anmoch.\n"
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
 "\n"
-"Tha am prògram seo air sgaoileadh ann an dòchas gum bi e feumail,\n"
-"ach GUN BARRANTAS SAM BITH: às aonais no fuis ri thuigse barrantas de\n"
-"MARSANTACHD no ION-FHREAGARRACHD OBRACHAIDH. Faic an\n"
-"GNU Ceadachas Poblach Coitcheann son barrachd fiosrachd.\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 "\n"
-"Bu chòir dhut fhaighinn leth-bhreac den GNU Ceadachas Poblach Coitcheann\n"
-"còmhla leis am prògram seo. 'S mar nach d'fhuair faic "
-"<http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
-msgstr "Mu dheidhinn Simple Scan"
+msgstr "Mu dhèidhinn gleus simplidh nan sgana"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
-msgstr "Inneal sganadh sgrìobhainn simplidh"
+msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  alasdair caimbeul https://launchpad.net/~alexd"
+"  Akerbeltz https://launchpad.net/~fios\n"
+"  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
-msgstr "Sàbhail sgrìobhainn ro fàgail?"
+msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
-msgstr "Fàg gun Sàbhail"
+msgstr "Fàg gun a shàbhaladh"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
-msgstr "%d dgò (bunaiteach)"
+msgstr "%d dpi (bun-roghainn)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
-msgstr "%d dgò (dreachd)"
+msgstr "%d dpi (dreachd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr "%d dgò (dùmhlachd-bhreacaidh àrd)"
+msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
-msgstr "%d dgò"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
-msgstr "Faidhlichean a dhìth"
+msgstr "Tha faidhlichean a dhìth"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
-msgstr "Sgrùd sibh a stàladh agaibh"
+msgstr "Thoir sùil air an stàladh agad"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
-msgstr "Atharraich _Sganair"
+msgstr "Atharraich an _sganair"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
-msgstr "Fèin-sheòlaidh"
+msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Nas duirche"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Nas lugha"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Barrrachd"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "As lugha"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "As motha"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
-msgstr "A' sàbhaladh sgrìobhainn..."
+msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr "A' sàbhaladh duilleag %d a-mach a %d"
+msgstr "A' sàbhaladh duilleag %d a-mach à %d"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Àirde na h-uinneige ann am piosgailean"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Leud na h-uinneige ann am piosgailean"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE ma tha uinneag na h-aplacaid air a làn-mheudachadh"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Comhair an sganair thairis air an duilleag a tha 'ga sganadh."
+
+#~ msgid "Direction of scan"
+#~ msgstr "Comhair an sgana"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Àirde na h-ìomhaigh a tha 'ga sganadh ann am piosgailean"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Leud na h-ìomhaigh a tha 'ga sganadh ann am piogsailean. Thèid leud na "
+#~ "duilleige mu dheireadh a chaidh a sganadh a chur an-seo."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Àirde na h-ìomhaigh a tha 'ga sganadh ann am piogsailean. Thèid àirde na "
+#~ "duilleige mu dheireadh a chaidh a sganadh a chur an-seo."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Leud na h-ìomhaigh a tha 'ga sganadh ann am piogsailean"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "Dùmhlachd-bhreacaidh, ann a dotagan gach òirleach, na h-ìomhaighe a chaidh a "
+#~ "sganadh roimhe."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr ""
+#~ "Dùmhlachd-bhreacaidh na h-ìomhaighe a chaidh a sganadh turas mu dheireadh"
diff --git a/po/gl.po b/po/gl.po
index 009c308..feaf024 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:01+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2013-10-05 07:56+0000\n"
+"Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Nome de _usuario para o recurso:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Contrasinal:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Texto"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotografía"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Anverso e reverso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Anverso"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Atrás"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Escaner sinxelo"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Esc_anear"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Única _páxina"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Todas as páxinas do _alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Deter o escaneado"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Texto"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotografía"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "Correo-_e"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
-msgstr "_Ningunha"
+msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotar o recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr ""
+msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr ""
+msgstr "Mover á dereita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Axuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Contidos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Iniciar un novo documento"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Escanear unha única páxina desde o escaner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Gardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Deter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rotar á esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Xirar a páxina á dereita (sentido do reloxo)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rotar á dereita"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Recortar a páxina seleccionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Recortar"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Nome de _usuario para o recurso:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Contrasinal:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Orixe de escaneo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Resolución _fotográfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Tamaño da páxina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Calidade:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Anverso e reverso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Anverso"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Atrás"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Largura da xanela en píxeles"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Altura da xanela en píxeles"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispositivo desde o que escanear"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE desde o que adquirir as imaxes."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipo de documento que está sendo escaneado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
 "procesado do escaneado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Dirección de escaneado"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "A dirección do escáner sobre a páxina escaneada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Largura da imaxe escaneada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A largura da imaxe escaneada. Este valor actualizase co que tivo a última "
-"páxina escaneada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Altura da imaxe escaneada en píxeles"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"A altura da imaxe escaneada. Este valor actualizase co que tivo a última "
-"páxina escaneada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Largura do papel en décimas de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "A largura do papel en décimas de mm (ou 0 para a detección automática do "
 "papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Altura do papel en décimas de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,90 +335,82 @@ msgstr ""
 "A altura do papel en décimas de mm (ou 0 para a detección automática do "
 "papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Brillo do escaneo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste do escaneo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolución da última imaxe escaneada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolución para o escaneado de texto"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolución para o escaneado de fotos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Cara da páxina a escanear"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "O lado da páxina a escanear."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directorio no que gardar os ficheiros"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "O directorio no que se gardarán os ficheiros. Por omisión usarase o "
 "directorio de documentos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Valor de calidade a usar na compresión JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Valor de calidade a usar na compresión JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Non hai escáneres dispoñíbeis. Conecte un escáner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Non foi posíbel conectar co escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Non foi posíbel iniciar o escaneado"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Produciuse un erro na comunicación co escáner"
 
@@ -503,98 +451,110 @@ msgstr ""
 "Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
 "ordes dispoñíbeis."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf escaneado"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Pechar"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Gardar como..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Gardar"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Elixa o _tipo de ficheiro"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de múltiples páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Non foi posíbel gardar a imaxe da miniatura"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -623,16 +583,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,98 +603,95 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Faltan ficheiros"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Comprobe a súa instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Máis"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -743,6 +700,12 @@ msgstr "Gardando páxina %d de %d"
 #~ "Uso:\n"
 #~ "  %s [DISPOSITIVO...] - Utilidade de escaneo"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Dirección de escaneado"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Altura da imaxe escaneada en píxeles"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -759,6 +722,18 @@ msgstr "Gardando páxina %d de %d"
 #~ "«photo» para fotos. Esta opción determina a resolución, as cores e o "
 #~ "postprocesamento do escaneado."
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Largura da imaxe escaneada"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Altura da xanela en píxeles"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Largura da xanela en píxeles"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -775,12 +750,35 @@ msgstr "Gardando páxina %d de %d"
 #~ "  --help-all                      Mostra todas as opcións de axuda\n"
 #~ "  --help-gtk                      Mostra as opcións de GTK+"
 
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolución da última imaxe escaneada"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "A cara da páxina que desexe escanear. Pode ser un dos seguintes: «ambos», "
 #~ "«anverso» e «recverso»"
 
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "A dirección do escáner sobre a páxina escaneada."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "A largura da imaxe escaneada. Este valor actualizase co que tivo a última "
+#~ "páxina escaneada."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "A altura da imaxe escaneada. Este valor actualizase co que tivo a última "
+#~ "páxina escaneada."
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
diff --git a/po/he.po b/po/he.po
index 70b9260..4005eff 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_אימות"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_שם המשתמש עבור המשאב:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_ססמה:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "טקסט"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "צילום"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "גב וחזית"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "חזית"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "גב"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "סריקה פשוטה"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "מ_סמך"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "_סריקה"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "עמוד _בודד"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "כל הדפים מהמ_זין"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "ע_צירת הסריקה"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "טקסט"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "צילום"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_דוא״ל"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_עמוד"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_חיתוך"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_ללא"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_מכתב"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_פוליו"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "ה_תאמה אישית"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_סיבוב חיתוך"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "ע_זרה"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_תוכן"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "התחלת מסמך חדש"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "חדש"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "סריקת עמוד בודד מהסורק"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "סריקה"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "שמירה"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "עצירת הסריקה הנוכחית"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "עצירה"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "סיבוב העמוד לשמאל (נגד כיוון השעון)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "סיבוב שמאלה"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "סיבוב העמוד לימין (עם כיוון השעון)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "סיבוב ימינה"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "חיתוך העמוד שנבחר"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "חיתוך"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_שם המשתמש עבור המשאב:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_ססמה:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_אימות"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "העדפות"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_מקור הסריקה:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "ר_זולוציית הטקסט:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_רזולוציית התמונה:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "הצד הנסרק:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "מידות הדף:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "בהירות:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "ניגודיות:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "גב וחזית"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "חזית"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "גב"
+msgid "Quality:"
+msgstr "איכות:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "סריקת מסמכים"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Window width in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Window height in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE if the application window is maximized"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Device to scan from"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE device to acquire images from."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Type of document being scanned"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direction of scan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "The direction of the scanner across the scanned page."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Width of scanned image in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Height of scanned image in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Width of paper in tenths of a mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Height of paper in tenths of a mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,89 +335,81 @@ msgstr ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "בהירות הסריקה"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "התאמת הבהירות מ־‎-100 ועד 100 (0 - ללא השפעה)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "ניגודיות הסריקה"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "התאמת הניגודיות מ־‎-100 ועד 100 (0 - ללא השפעה)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolution of last scanned image"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "The resolution in dots-per-inch of the previously scanned image."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolution for text scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "The resolution in dots-per-inch to use when scanning text."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolution for photo scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "The resolution in dots-per-inch to use when scanning photos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Page side to scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "The page side to scan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directory to save files to"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "The directory to save files to. Defaults to the documents directory if unset."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "ערך האיכות לשימוש לדחיסת JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "ערך האיכות לשימוש לדחיסת JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "אין סורקים זמינים. נא לחבר סורק."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "לא ניתן להתחבר לסורק"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "אירעה שגיאה בעת ההתקשרות עם הסורק"
 
@@ -501,98 +449,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "ס_גירה"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "נדרשים שם משתמש וססמה כדי לגשת אל '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_ביטול"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_שמירה"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "בחירת _סוג הקובץ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "שמירת הקובץ נכשלה"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ללא שמירה, השינויים יאבדו לעד."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -619,16 +579,16 @@ msgstr ""
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -641,98 +601,95 @@ msgstr ""
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "חסרים קבצים"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "יש לבדוק את ההתקנה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "כהה יותר"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "פחות"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "יותר"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "מזערי"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "מרבי"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -763,6 +720,25 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Height of scanned image in pixels"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE if the application window is maximized"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direction of scan"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolution of last scanned image"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -779,6 +755,25 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Window height in pixels"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "The resolution in dots-per-inch of the previously scanned image."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Width of scanned image in pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Window width in pixels"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -799,3 +794,6 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "The direction of the scanner across the scanned page."
diff --git a/po/hr.po b/po/hr.po
index ab32d78..4d542d6 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Ovlasti"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Korisničko ime za izvor:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotografija"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Prednje i stražnje"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Prednje"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Natrag"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Jednostavno skeniranje"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_eniraj"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Jedna _stranica"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Sve stranice iz _uvlakača"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Zaustavi skeniranje"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotografija"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rotiraj _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rotiraj _desno"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotiraj isječak"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Pomoć"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Sadržaj"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Započni novi dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skeniraj jednu stranicu sa skenera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skeniraj"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Spremi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Prekini trenutno skeniranje"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Zaokreni stranicu ulijevo (obrnuto od kazaljke na satu)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Zaokreni ulijevo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Zaokreni stranicu udesno (u smjeru kazaljke na satu)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Zaokreni udesno"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Izreži odabranu stranicu"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Izreži"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Korisničko ime za izvor:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Lozinka:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Ovlasti"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Osobitosti"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Izvor skeniranja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Rezolucija teksta:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Rezolucija slike"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Stranica skeniranja:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Veličina stranice:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Prednje i stražnje"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Prednje"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Natrag"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skenirajte dokumente"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Širina prozora u pikselima"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Visina prozora u pikselima"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "ISTINA ako je prozor aplikacije maksimalan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Uređaj za skeniranje"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE uređaj iz kojeg se dobiva slika."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Vrsta dokumenat koji se skenira"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
 "naknadnu obradu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Smjer skeniranja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Smjer skenera preko skenirane stranice."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Širina skenirane slike u pikselima"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Širina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
-"zadnje skenirane stranice."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Visina skenirane slike u pikselima"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Visina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
-"zadnje skenirane stranice."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Širina papira u desetinkama milimetra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Širina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
 "papira)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Visina papira u desetinkama milimetra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,92 +335,84 @@ msgstr ""
 "Visina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
 "papira)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Rezolucija zadnje skenirane slike"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Rezolucija u točkama po inču prethodno skenirane slike."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Rezolucija za skeniranje teksta"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Rezolucija u točkama po inču za korištenje prilikom skeniranja teksta."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Rezolucija za skeniranje fotografija"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "Rezolucija u točkama po inču za korištenje prilikom skeniranja slika."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Strana lista za skeniranje"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Strana stranice za skeniranje."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Direktorij za pohranu datoteka"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Direktorij za pohranu datoteka. Ako nije postavljeno, koristi se direktorij "
 "dokumenata."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nema dostupnih skenera. Molim spojite skener."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nije moguće povezati se na skener"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Početak skeniranja nije moguć"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Greška pri komunikaciji sa skenerom"
 
@@ -505,98 +453,110 @@ msgstr ""
 "Pokrenite '%s --help'  kako biste vidjeli potpunu listu dostupnih mogućnosti "
 "naredbenog retka."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Niti jedan skener nije otkriven"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Molim provjerite je li skener spojen i uključen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Spremi kao..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Sve datoteke"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Odaberite _vrstu datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimirano)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Neuspjelo pohranjivanje datoteke"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Pohraniti trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Spremanje slike za pretpregled nije uspjelo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Nije moguće otvoriti program za pregled slike"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Nije moguće otvoriti datoteku pomoći"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -625,16 +585,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "O jednostavnom skeniranju"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -647,98 +607,98 @@ msgstr ""
 "  student4 https://launchpad.net/~iputnik-msn"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Pohraniti dokument prije prekida rada?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Prekini bez spremanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (nacrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (visoka rezolucija)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Nedostaju datoteke"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Molim provjerite vašu instalaciju"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Promjeni _Skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Smjer skeniranja"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -746,6 +706,22 @@ msgstr ""
 #~ "Smjer skenera preko skeniranih stranica. Može biti: 's vrha na dno' 's dna "
 #~ "na vrh' 's lijeva na desno \",\" s desna na lijevo \""
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Visina skenirane slike u pikselima"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "ISTINA ako je prozor aplikacije maksimalan"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Visina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
+#~ "zadnje skenirane stranice."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Rezolucija zadnje skenirane slike"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -755,6 +731,22 @@ msgstr ""
 #~ "za slike. Ova postavka odlučuje o rezoluciji skeniranja, boji i obradi nakon "
 #~ "skeniranja."
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Rezolucija u točkama po inču prethodno skenirane slike."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Širina skenirane slike u pikselima"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Širina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
+#~ "zadnje skenirane stranice."
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Širina prozora u pikselima"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -771,6 +763,9 @@ msgstr ""
 #~ "  --help-all Prikaži sve pomoćne opcije\n"
 #~ "  --help-gtk Prikaži GTK+ opcije"
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Visina prozora u pikselima"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -802,3 +797,6 @@ msgstr ""
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "Strana lista za skeniranje. Može biti: 'obje' 'prednja' 'stražnja'"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Smjer skenera preko skenirane stranice."
diff --git a/po/hu.po b/po/hu.po
index 6efd7b6..4268c80 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:02+0000\n"
-"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2014-02-18 14:14+0000\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Felhatalmazás"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Felhasználónév az erőforráshoz:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Jelszó:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Szöveg"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fénykép"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Előlap és hátlap"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Előlap"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Hátlap"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokumentum"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sz_kennelés"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Egy _oldal"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
-msgstr "Minden oldal az _olvasóból"
+msgstr "Minden oldal az _adagolóból"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Szkennelés megállítása"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Szöveg"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fénykép"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
-msgstr "_Kivágás"
+msgstr "_Vágás"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
-msgstr "_Nincs"
+msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "Kivágott rész fo_rgatása"
+msgstr "Vágott rész fo_rgatása"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mozgatás balra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Súgó"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Tartalom"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Új dokumentum létrehozása"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Új"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Egy oldal szkennelése az eszközről"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Szkennelés"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Mentés"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "A jelenlegi szkennelés leállítása"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Leállít"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Az oldal elforgatása balra (óra járásával ellentétesen)"
+msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Forgatás balra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
-msgstr "Az oldal elforgatása jobbra (óra járásával egyezően)"
+msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Forgatás jobbra"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
-msgstr "A kiválasztott oldal levágása"
+msgstr "A kiválasztott oldal vágása"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
-msgstr "Kivágás"
-
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Felhasználónév az erőforráshoz:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Jelszó:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Felhatalmazás"
+msgstr "Vágás"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Beállítások"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Szkennelés _forrása:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Szöveg felbontása:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Fotó felbontása:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Oldal szkennelése:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Oldalméret:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Fényerő:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontraszt:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Előlap és hátlap"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Előlap"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Hátlap"
+msgid "Quality:"
+msgstr "Minőség:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Dokumentumok szkennelése"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Ablak szélessége képpontban"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Ablak magassága képpontban"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "A szkennelő eszkőz"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Képek beszerzése erről a SANE eszközről"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "A szkennelt dokumentum típusa"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,144 +311,104 @@ msgstr ""
 "A szkennelt dokumentum típusa. Ez a beállítás meghatározza a beolvasott "
 "oldal felbontását, színeit és utófeldolgozását."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "A szkennelés íránya"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "A szkennelés iránya a szkennelt lap fölött."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "A szkennelt kép szélessége képpontban"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A szkennelt kép szélessége képpontban. Mindig a legutolsó szkennelés "
-"eredményét veszi fel."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "A szkennelt kép magassága képpontban"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"A szkennelt kép magassága képpontban. Mindig a legutolsó szkennelés "
-"eredményét veszi fel."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Papír szélessége tizedmilliméterben"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Papír magassága tizedmilliméterben"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "A beolvasás fényereje"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "A fényerő változtatása -100-tól 100-ig (0=nincs)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "A beolvasás kontrasztja"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "A kontraszt változtatása -100-tól 100-ig (0=nincs)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Az utoljára beszkennelt kép felbontása"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Az utoljára beszkennelt kép DPI felbontása."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Szövegek szkennelésének felbontása"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Fotók szkennelésének felbontása"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Fotók szkennelésnél használandó  DPI felbontás."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Lapok szkennelendő oldala"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "A lap szkennelendő oldala."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Fájlok mentése ebbe a könyvtárba"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
 "beállítva."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "A minőségi tényező megadása a JPEG tömörítéshez"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "A minőségi tényező megadása a JPEG tömörítéshez."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nem található szkenner. Csatlakoztasson egyet."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nem sikerült csatlakozni a szkennerhez"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nem sikerült elindítani a szkennelést"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Kommunikációs hiba a szkennerrel"
 
@@ -500,99 +448,111 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Bezárás"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Mentés másként…"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Mégse"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Mentés"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Válasszon fájl_típust"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "A képfájlt nem lehet elmenteni előnézethez"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -620,16 +580,16 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -642,101 +602,99 @@ msgstr ""
 "  Péter Trombitás https://launchpad.net/~trombipeti\n"
 "  Richard Somlói https://launchpad.net/~ricsipontaz\n"
 "  Szávics Dániel https://launchpad.net/~szavics-dani-deactivatedaccount\n"
-"  csola48 https://launchpad.net/~mail-csordaslaszlo"
+"  csola48 https://launchpad.net/~mail-csordaslaszlo\n"
+"  Úr Balázs https://launchpad.net/~urbalazs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Hiányzó fájl"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Ellenőrizze a telepítést"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Sötétebb"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Világosabb"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Kevesebb"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Több"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -768,6 +726,12 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ "  --gtk-module=MODULOK            További GTK+ modulok betöltése\n"
 #~ "  --g-fatal-warnings              Minden figyelmeztetés végzetes legyen"
 
+#~ msgid "Direction of scan"
+#~ msgstr "A szkennelés íránya"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -785,6 +749,12 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ "fotókhoz. Ez a beállítás határozza meg a szkennelt dokumentum felbontását, "
 #~ "színeit és utófeldolgozását."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Ablak magassága képpontban"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Ablak szélessége képpontban"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -801,8 +771,37 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ "  -help-all Minden súgókapcsoló megjelenítése\n"
 #~ "  --help-gtk GTK+ kapcsolók megjelenítése"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "A szkennelt kép magassága képpontban"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "A szkennelt kép szélessége képpontban. Mindig a legutolsó szkennelés "
+#~ "eredményét veszi fel."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "A szkennelt kép magassága képpontban. Mindig a legutolsó szkennelés "
+#~ "eredményét veszi fel."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "A szkennelt kép szélessége képpontban"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Az utoljára beszkennelt kép DPI felbontása."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Az utoljára beszkennelt kép felbontása"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Lapok szkennelendő oldala. A lehetséges értékek: „both” (mindkettő) „front” "
 #~ "(előlap), „back” (hátlap)"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "A szkennelés iránya a szkennelt lap fölött."
diff --git a/po/hy.po b/po/hy.po
index 0704a24..be981c2 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Armenian <hy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Ետ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr ""
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Ետ"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,110 +561,104 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Serj Safarian https://launchpad.net/~safarian"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 829b38d..5d61bc0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,580 +7,551 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:02+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2014-01-18 00:43+0000\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "Otoris_asikan"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Nama pengg_una untuk sumber daya:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Sandi:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teks"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Depan dan Belakang"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Depan"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Belakang"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
-msgstr ""
+msgstr "Pemindai Ringkas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
-msgstr ""
+msgstr "_Dokumen"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
-msgstr ""
+msgstr "Pind_ai"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
-msgstr ""
+msgstr "Satu _Halaman"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
-msgstr ""
+msgstr "Semua Halaman Dari _Feeder"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
-msgstr ""
-
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr ""
+msgstr "Berhenti _Memindai"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
-msgstr ""
+msgstr "Sur_el"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
-msgstr ""
+msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
-msgstr ""
+msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
-msgstr ""
+msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
-msgstr ""
+msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
-msgstr ""
+msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
-msgstr ""
+msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
-msgstr ""
+msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr ""
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
-msgstr ""
+msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr ""
+msgstr "Puta_r dan Potong"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr ""
+msgstr "Pindah Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr ""
+msgstr "Pindah Ke Kanan"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
-msgstr ""
+msgstr "_Isi"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
-msgstr ""
+msgstr "Pindai"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+msgstr "Putar halaman ke kanan (searah jarum jam)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
-msgstr ""
+msgstr "Preferensi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
-msgstr ""
+msgstr "_Sumber Pindai:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr ""
+msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
-msgstr ""
+msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontras:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr ""
+msgid "Quality:"
+msgstr "Kualitas:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
-msgstr ""
+msgstr "Pindai Dokumen"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
-msgstr ""
+msgstr "Perangkat untuk memindai"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "Perangkat SANE yang dipakai untuk mengambil gambar."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
-msgstr ""
+msgstr "Tipe dokumen yang akan dipindai"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
+"Tipe dokumen yang akan dipindai. Pengaturan ini menentukan resolusi, warna, "
+"dan pasca-proses pemindaian."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Lebar kertas dalam persepuluhan milimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Lebar kertas dalam persepuluhan mm (atau 0 untuk deteksi kertas otomatis)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Panjang kertas dalam persepuluh mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Panjang kertas dalam sepersepuluh mm (atau 0 jika kertas dideteksi otomatis)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Kecerahan pemindaian"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Penyesuaian kecerahan dari -100 ke 100 (0 berarti nihil)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Kontras pemindaian"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Penyesuaian kontras dari -100 ke 100 (0 berarti nihil)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
-msgstr ""
+msgstr "Resolusi untuk pemindaian teks"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian teks."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
-msgstr ""
+msgstr "Resolusi untuk pemindaian foto"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+msgstr "Resolusi dalam dots-per-inch yang digunakan dalam pemindaian foto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
-msgstr ""
+msgstr "Sisi halaman yang dipindai"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
-msgstr ""
+msgstr "Sisi halaman yang dipindai."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
-msgstr ""
+msgstr "Simpan berkas ke direktori"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Direktori tempat menyimpan berkas. Akan disimpan ke direktori dokumen jika "
+"belum diset."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Nilai kualitas yang akan dipakai untuk kompresi JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Tidak ada pemindai yang tersedia. Mohon hubungkan pemindai."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Tak dapat terhubung ke pemindai"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Tak dapat memulai pemindaian"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "Galat saat berhubungan dengan pemindai"
 
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
 msgid "Show release version"
-msgstr ""
+msgstr "Tampilkan versi rilis"
 
 #. Help string for command line --debug flag
 #: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr ""
+msgstr "Cetak pesan pengawakutuan"
 
 #: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr ""
+msgstr "Perbaiki berkas PDF yang dibuat dengan Simple Scan versi lawas"
 
 #. Title of error dialog when scan failed
 #: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "Gagal memindai"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Dokumen Terpindai"
 
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:529
 msgid "[DEVICE...] - Scanning utility"
-msgstr ""
+msgstr "[PERANGKAT...] - Utilitas pemindaian"
 
 #. Text printed out when an unknown command-line argument provided
 #: ../src/simple-scan.vala:540
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
+msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
-msgstr ""
+msgstr "Dokumen Hasil Pindai.pdf"
+
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Tutup"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
-msgstr ""
+msgstr "Tidak ada pemindai yang terdeteksi"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
+"Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
-msgstr ""
+msgstr "Simpan Sebagai..."
+
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Batal"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Simpan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
-msgstr ""
+msgstr "Berkas Citra"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
-msgstr ""
+msgstr "Semua Berkas"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
-msgstr ""
+msgstr "Pilih _Tipe Berkas"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
-msgstr ""
+msgstr "PDF (dokumen multi-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
-msgstr ""
+msgstr "JPEG (terkompresi)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
-msgstr ""
+msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
-msgstr ""
+msgstr "Gagal menyimpan berkas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
-msgstr ""
+msgstr "Simpan dokumen saat ini?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
-msgstr ""
+msgstr "Buang Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
-msgstr ""
+msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -595,23 +566,36 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Program ini adalah perangkat lunak bebas: anda dapat mendistribusikan\n"
+"kembali dan/atau memodifikasinya dibawah  termsdari GNU General \n"
+"Public License sebagaimana dipublikasi oleh Free Software Foundation,\n"
+"baik lisensi versi 3 maupun (sesuai pilihan anda) versi yang lain.\n"
+"Program ini didistribusikan dengan harapan akan menjadi berguna,\n"
+"namun TANPA PEMBENARAN; bahkan tanpa pembenaran tersirat untuk\n"
+" DIPERDAGANGKAN atau KESESUAIAN UNTUK TUJUAN TERTENTU. lihat\n"
+"GNU General Public License untuk detail selengkapnya.\n"
+"\n"
+"Anda seharusnya mendapat salinan GNU General Public License\n"
+"bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
-msgstr ""
+msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Abdul Munif Hanafi https://launchpad.net/~nafica-coroz\n"
+"  Andika Triwidada https://launchpad.net/~andika\n"
 "  Arief Setiadi Wibowo https://launchpad.net/~q-thrynx\n"
+"  Budi Prasetyo https://launchpad.net/~bprast1\n"
 "  Hace https://launchpad.net/~hardikris\n"
 "  La Ode Adam Saputra https://launchpad.net/~laode-saputra\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
@@ -625,94 +609,129 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Simpan dokumen sebelum keluar"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Keluar tanpa menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
-msgstr ""
+msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
-msgstr ""
+msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
-msgstr ""
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
-msgstr ""
+msgstr "Berkas hilang"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
-msgstr ""
+msgstr "Mohon periksa instalasi Anda"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Ganti _Pemindai"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
-msgstr ""
+msgstr "Otomatis"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Lebih Terang"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Kurang"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Lebih"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
-msgstr ""
+msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr ""
+msgstr "Menyimpan halaman %d dari %d"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolusi pemindaian terakhir"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Arah pemindaian"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Arah pemindaian terhadap halaman yang dipindai."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE jika jendela aplikasi dimaksimalkan"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Resolusi dalam dots-per-inch dari gambar sebelumnya."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Tinggi jendela dalam piksel"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Lebar jendela dalam piksel"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Tinggi gambar terpindai dalam piksel"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Lebar gambar terpindai dalam piksel. Nilai ini diupdate sesuai halaman "
+#~ "terakhir yang pernah dipindai."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Tinggi gambar terpindai dalam piksel. Nilai ini diupdate sesuai halaman "
+#~ "terakhir yang pernah dipindai."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Lebar gambar terpindai dalam piksel"
diff --git a/po/it.po b/po/it.po
index d205cc9..fdcc2d9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-08-22 07:09+0000\n"
 "Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizza"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Nome utente per la risorsa:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "Pass_word:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Testo"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Fronte e retro"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Fronte"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Retro"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "_Acquisisci"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Pagina singola"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "_Tutte le pagine dal caricatore"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Ferma l'acqui_sizione"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Testo"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Ritaglio"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Sposta a sinistra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Sposta a destra"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "A_iuto"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Sommario"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Crea un nuovo documento"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nuovo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Acquisisce una pagina singola dallo scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Acquisisci"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Salva"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Ferma"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Ruota la pagina a destra (senso orario)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Ritaglia la pagina selezionata"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Ritaglia"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Nome utente per la risorsa:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "Pass_word:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizza"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "S_orgente di acquisizione:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Risoluzione _testo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Risoluzione foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Lato acquisizione:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Dimensione pagina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Luminosità:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contrasto:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Qualità:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Fronte e retro"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Fronte"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Retro"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Acquisisci documenti"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Larghezza della finestra in pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Altezza della finestra in pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERO se la finestra dell'applicazione è massimizzata"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispositivo di acquisizione"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE da cui acquisire le immagini."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipo del documento da acquisire"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -324,148 +312,107 @@ msgstr ""
 "risoluzione, il numero dei colori e l'elaborazione successiva "
 "all'acquisizione."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direzione dell'acquisizione"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "La direzione dell'acquisizione lungo la pagina."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Larghezza dell'immagine acquisita in pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Larghezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
-"all'ultima acquisizione."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Altezza dell'immagine acquisita in pixel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Altezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
-"all'ultima acquisizione."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Larghezza del foglio in decimi di mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "L'altezza del foglio in decimi di mm  (0 per il rilevamento automatico)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Altezza del foglio in decimi di mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Luminosità dell'acquisizione"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 "La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contrasto dell'acquisizione"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Risoluzione dell'ultima immagine acquisita"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"La risoluzione in punti per pollice del documento precedentemente acquisito."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Risoluzione per acquisizione testo"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "La risoluzione in punti per pollice da usare per l'acquisizione di testi."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Risoluzione per acquisizione foto"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "La risoluzione in punti per pollice da usare per l'acquisizione di foto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Lato della pagina da acquisire"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Lato della pagina da acquisire."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Directory dove salvare i file"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "La directory dove salvare i file. Il valore predefinito è la directory dei "
 "documenti."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Indica il valore della qualità per la compressione JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Indica il valore della qualità per la compressione JPEG"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nessuno scanner disponibile. Collegare uno scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Impossibile connettersi allo scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Impossibile avviare l'acquisizione"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Errore di comunicazione con lo scanner"
 
@@ -506,99 +453,111 @@ msgstr ""
 "Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
 "riga di comando."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Chiudi"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Salva come..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "A_nnulla"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Salva"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Seziona il _tipo di file"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non si salva le modifiche andranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Impossibile salvare l'immagine per l'anteprima"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -629,16 +588,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,6 +608,7 @@ msgstr ""
 "  Daniele Napolitano https://launchpad.net/~dnax88\n"
 "  Daniele Sapino https://launchpad.net/~daniele-sapino\n"
 "  Federico Foschini https://launchpad.net/~undicizeri\n"
+"  Federico Pontelli https://launchpad.net/~fpontelli\n"
 "  Giasone https://launchpad.net/~giasone\n"
 "  Giovanni Mottola https://launchpad.net/~trottola-deactivatedaccount\n"
 "  Leonardo Corato https://launchpad.net/~leocor\n"
@@ -664,98 +624,134 @@ msgstr ""
 "  phede92 https://launchpad.net/~phede92"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "File mancanti"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Verificare l'installazione"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Più scura"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Minore"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Maggiore"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minima"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Massima"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Altezza della finestra in pixel"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Larghezza della finestra in pixel"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Altezza dell'immagine acquisita in pixel"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direzione dell'acquisizione"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Risoluzione dell'ultima immagine acquisita"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Larghezza dell'immagine acquisita in pixel"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Larghezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
+#~ "all'ultima acquisizione."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Altezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
+#~ "all'ultima acquisizione."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "La risoluzione in punti per pollice del documento precedentemente acquisito."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERO se la finestra dell'applicazione è massimizzata"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -824,3 +820,6 @@ msgstr "Salvataggio pagina %d di %d"
 #~ "Tipo di documento da acquisire. \"text\" per documenti di testo, \"photo\" "
 #~ "per fotografie. Questa impostazione influenza la risoluzione "
 #~ "dell'acquisizione, le impostazioni di colore e la post-produzione."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "La direzione dell'acquisizione lungo la pagina."
diff --git a/po/ja.po b/po/ja.po
index c7d37c4..af327a2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "認証(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "リソースに対するユーザ名(_U):"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "パスワード(_P):"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "テキスト"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "写真"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "表面と裏面"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "表面"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "戻る"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "シンプルスキャン"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "ドキュメント(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "スキャン(_A)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "一枚のページ(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "フィーダより全てのページ(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "スキャン停止(_S)"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "テキスト"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "写真"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "電子メール(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US レター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US リーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "コンテンツ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "新規ドキュメントの作成"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "新規"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "一枚のページをスキャンします"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "スキャン"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "スキャンを停止します"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ページを左回転 (反時計回り)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "左へ回転"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ページを右回転 (時計回り)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "右へ回転"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "選択した範囲の切り抜き"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "切り抜き"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "リソースに対するユーザ名(_U):"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "パスワード(_P):"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "認証(_A)"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
-msgstr "原稿をスキャン(_O):"
+msgstr "スキャンする対象(_O):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "テキストの画素数(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "写真の画素数(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "スキャン面:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "ページサイズ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "明るさ:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "コントラスト:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "品質:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "表面と裏面"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "表面"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "戻る"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "ドキュメントをスキャンします"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "ウィンドウの幅(ピクセル)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "ウィンドウの高さ(ピクセル)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "スキャンするデバイス"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "画像を取得する SANE デバイスです。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "スキャンするドキュメントの種類"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr "スキャンされる文書の種類。この設定により、画像の解像度、色の深度、事後処理が決定されます。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "スキャン方向"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "スキャナの走査方向"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "スキャン画像の幅(ピクセル)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "スキャンされる画像の高さ(ピクセル)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンしたページのものに更新されます。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "10mm単位での紙の幅"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "10mm単位の用紙の高さ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "スキャンの明るさ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "-100から100までの範囲で明るさを調節する (0は無調整)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "スキャンのコントラスト"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "-100から100までの範囲でコントラストを調節する (0は無調整)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "最後にスキャンした画像の解像度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "前にスキャンした画像の解像度(DPI)です。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "テキストスキャンの解像度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "テキストをスキャンするときの解像度(DPI)です。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "写真スキャンの解像度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "写真をスキャンするときの解像度(DPI)です。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "スキャンする面"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "スキャンされる面"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ファイルを保存するディレクトリ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "JPEGの圧縮に使用する品質の値"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "JPEGの圧縮に使用する品質の値です。"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "スキャナに接続できません"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "スキャナとの通信に失敗しました"
 
@@ -489,98 +441,110 @@ msgstr "[デバイス...] - スキャンユーティリティ"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "保存(_S)"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,16 +561,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -614,6 +578,7 @@ msgstr ""
 "  Hajime Mizuno https://launchpad.net/~mizuno-as\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
 "  Jun Kobayashi https://launchpad.net/~jkbys\n"
+"  Kenichi Ito https://launchpad.net/~ken-i54k\n"
 "  Kentaro Kazuhama https://launchpad.net/~kazken3\n"
 "  Koichi Akabe https://launchpad.net/~vbkaisetsu\n"
 "  MANABE Akinari https://launchpad.net/~maaanaari\n"
@@ -621,98 +586,95 @@ msgstr ""
 "  Tosiki Iga https://launchpad.net/~tosiki-iga"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "ファイルが見つかりません"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "インストールされているか確認してください"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "弱く"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "強く"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "最小"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "最大"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -721,6 +683,38 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ "使い方:\n"
 #~ "  %s [DEVICE...] - スキャンニング装置"
 
+#~ msgid "Direction of scan"
+#~ msgstr "スキャン方向"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "スキャンされる画像の高さ(ピクセル)"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr "ピクセル単位のスキャンされたイメージの高さです。この値は最後にスキャンしたページのものに更新されます。"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "最後にスキャンした画像の解像度"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "ウィンドウの高さ(ピクセル)"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "ウィンドウの幅(ピクセル)"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "前にスキャンした画像の解像度(DPI)です。"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "スキャン画像の幅(ピクセル)"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "スキャナの走査方向"
diff --git a/po/kk.po b/po/kk.po
index 3b71127..f54fbdf 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Құпия сөз:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Мәтін"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Фото"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Бет жағы"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Сырты"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Мәтін"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Фото"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "Құра_масы"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Жаңа"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Сақтау"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Тоқтау"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Солға бұру"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Қиып жіберу"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Құпия сөз:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Баптаулары"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Бет жағы"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Сырты"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Сақтамасаңыз, өзгерістер қайтпастай жоғалады."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,16 +561,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -614,94 +578,88 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index b0d9075..e5bfc0e 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "ការ​អនុញ្ញាត"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "ឈ្មោះ​អ្នកប្រើ​ធនធាន ៖"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "ពាក្យសម្ងាត់ ៖"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "អត្ថបទ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "រូបថត"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "មុខ នឹង​ក្រោយ"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "មុខ"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "ថយក្រោយ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "ស្កេន​ធម្មតា"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "ឯកសារ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "ស្កេន"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "ទំព័រ​ម្ខាង"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "ទំព័រ​ទាំងអស់​ពី​កម្មវិធី​មតិ"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "ឈប់​ស្កេន"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "អត្ថបទ"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "រូបថត"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "អ៊ីមែល"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "ទំព័រ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "បង្វិល​ស្ដាំ"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "ច្រឹប"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "គ្មាន"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "សំបុត្រ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "ស្រប​ច្បាប់"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "បង្វិល​ការ​ច្រឹប"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "ផ្លាស់ទី​ទៅ​ឆ្វេង"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "ផ្លាស់ទី​ទៅ​ស្ដាំ"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "ជំនួយ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "មាតិកា"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "ថ្មី"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "ស្កេន​ទំព័រ​ទោល​ពី​ម៉ាស៊ីន​ស្កេន"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "ស្កេន"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "រក្សាទុក"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "បញ្ឈប់​ការ​ស្កេន​បច្ចុប្បន្ន"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "ឈប់"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ឆ្វេង (ច្រាស​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ស្ដាំ (ស្រប​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "បង្វិល​ស្ដាំ"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើស"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "ច្រឹប"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "ឈ្មោះ​អ្នកប្រើ​ធនធាន ៖"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "ពាក្យសម្ងាត់ ៖"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "ការ​អនុញ្ញាត"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "ស្កេន​ប្រភព ៖"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "គុណភាព​បង្ហាញ​អត្ថបទ ៖"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "គុណភាព​បង្ហាញ​រូបថត ៖"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "ស្កេន​ចំហៀង ៖"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "ទំហំ​ទំព័រ ៖"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "ពន្លឺ ៖"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "កម្រិត​ពណ៌ ៖"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "គុណភាព ៖"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "មុខ នឹង​ក្រោយ"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "មុខ"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "ថយក្រោយ"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "ស្កេន​ឯកសារ"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "ទទឹង​បង្អួច​គិតជា​ភិកសែល"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "កម្ពស់​បង្អួច​គិតជា​ភិកសែល"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "ពិត​ប្រសិនបើ​បង្អួច​កម្មវិធី​ត្រូវ​បាន​បង្រួម​អតិបរមា"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "ឧបករណ៍​ដែល​ត្រូវ​ស្កេន"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "ឧបករណ៍ SANE ដើម្បី​ទៅ​យក​រូបភាព ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -324,149 +312,106 @@ msgstr ""
 "ការ​កំណត់​នេះ​អាស្រ័យ​ទៅលើ​គុណភាព​បង្ហាញ ពណ៌ "
 "និង​ការ​ដំណើរការ​ជាមុន​របស់​ម៉ាស៊ីន​ស្កេន ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "ទិស​នៃ​ការ​ស្កេន"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "ទិស​ម៉ាស៊ីន​ស្កេន​កាត់តាម​ទំព័រ​ដែល​បាន​ស្កេន ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "ទទឹង​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"ទទឹង​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល ។ "
-"តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
-"ោយ ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "កម្ពស់​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"កម្ពស់​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល ។ "
-"តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
-"ោយ ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "ពន្លឺ​វិភាគ​រក"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "ការ​កែតម្រូវ​ពន្លឺ​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "កម្រិត​ពណ៌​វិភាគរក"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "ការ​កែតម្រូវ​កម្រិត​ពណ៌​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "គុណភាព​បង្ហាញ​សម្រាប់​រូបភាព​ដែល​បាន​ស្កេន​ចុងក្រោយ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ នៃ​រូបភាព​ដែល​បាន​ស្កេន​មុន ។"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​អត្ថបទ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
 "ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​អត្ថបទ ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​រូបថត"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
 "ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​រូបថត ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ ។ "
 "លំនាំដើម​ទៅកាន់​ថត​ឯកសារ​ប្រសិនបើ​មិន​បាន​កំណត់ ។"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "តម្លៃ​គុណភាព​​ប្រើ​សម្រាប់ JPEG compression"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "តម្លៃ​គុណភាព​ប្រើ​សម្រាប់ JPEG compression ។"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ពុំ​មាន​ម៉ាស៊ីន​ស្កេន​ទេ សូម​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន ។"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន​បាន​ទេ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ស្កេន​បាន​ទេ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "កំហុស​ក្នុង​ការ​ទាក់ទង​ទៅកាន់​ម៉ាស៊ីន​ស្កេន"
 
@@ -507,102 +452,114 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "ដំណើរការ '%s --help' ដើម្បី​មើល​បញ្ជី​ពេញលេញ​នៃ​បន្ទាត់​បញ្ជា​ដែល​មាន ។"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែល​បាន​ស្កេន"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "បិទ"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ទាមទារ​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់​ដើម្បី​ចូលដំណើរការ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "សូម​ពិនិត្យមើល​ម៉ាស៊ីន​ស្កេន​របស់​អ្នក​ថា​តើ​បាន​តភ្ជាប់ "
 "និង​បើក​កុងតាក់​ហើយ​ឬនៅ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "រក្សាទុក​ជា..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "បោះបង់"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "រក្សាទុក"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "ឯកសារ​រូបភាព"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "ឯកសារ​ទាំងអស់"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "ជ្រើស​ប្រភេទ​ឯកសារ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (បាន​បង្ហាប់)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មាន​ការ​បាត់បង់)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​ឯកសារ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "ប្រសិនបើ​អ្នក​មិន​រក្សាទុក​ទេ "
 "ការ​ផ្លាស់ប្ដូរ​ទាំងឡាយ​និង​ត្រូវ​បាន​បាត់បង់​ជា​អចិន្ត្រៃយ៍ ។"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -632,16 +589,16 @@ msgstr ""
 "សូម​មើល<http://www.gnu.org/licenses/> ។"
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,94 +607,135 @@ msgstr ""
 "  Seng Sutha https://launchpad.net/~sutha"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (គុណភាព​បង្ហាញ​ខ្ពស់)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "បាត់​ឯកសារ"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "សូម​ពិនិត្យមើល​ការ​ដំឡើង​របស់​អ្នក"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "កំពុង​រក្សាទុក​ឯកសារ..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "ទទឹង​បង្អួច​គិតជា​ភិកសែល"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "កម្ពស់​បង្អួច​គិតជា​ភិកសែល"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "ពិត​ប្រសិនបើ​បង្អួច​កម្មវិធី​ត្រូវ​បាន​បង្រួម​អតិបរមា"
+
+#~ msgid "Direction of scan"
+#~ msgstr "ទិស​នៃ​ការ​ស្កេន"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "ទិស​ម៉ាស៊ីន​ស្កេន​កាត់តាម​ទំព័រ​ដែល​បាន​ស្កេន ។"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "ទទឹង​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "ទទឹង​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល ។ "
+#~ "តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
+#~ "ោយ ។"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "កម្ពស់​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "កម្ពស់​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល ។ "
+#~ "តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
+#~ "ោយ ។"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "គុណភាព​បង្ហាញ​សម្រាប់​រូបភាព​ដែល​បាន​ស្កេន​ចុងក្រោយ"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ នៃ​រូបភាព​ដែល​បាន​ស្កេន​មុន ។"
diff --git a/po/ky.po b/po/ky.po
index fc30739..bb22de5 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,284 +7,284 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr ""
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
+msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
@@ -292,165 +292,117 @@ msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,110 +561,104 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Saltanat Osmonova https://launchpad.net/~salta007"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 5d28d78..c6381de 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr ""
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Perkelti kairėn"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skaitymo š_altinis:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Skaistis:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrastas:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr ""
+msgid "Quality:"
+msgstr "Kokybė:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,136 +311,100 @@ msgstr ""
 "Nuskaitomo dokumento tipas. Ši nuostata apsprendžia skaitymo skiriamąją "
 "gebą, spalvas ir baigiamąjį apdorojimą."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Skaitytuvo kryptis per skaitomą puslapį."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Nuskenuoto dokumento skaistis"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Skaisčio derinimas nuo -100 iki 100 (0 nėra)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Nuskenuoto dokumento kontrastas"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "Kontrasto derinimas nuo -100 iki 100 (0 nėra)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Puslapio pusė, kurią nuskaityti."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Kokybės reikšmė JPEG glaudinimui"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Kokybės reikšmė JPEG glaudinimui."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -494,98 +446,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jeigu neišsaugosite, pakeitimai bus nesugrąžinamai prarasti."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Išsaugoti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nepavyko išsaugoti paveikslo peržiūrai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -602,16 +566,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -624,94 +588,91 @@ msgstr ""
 "  romasg https://launchpad.net/~romasg"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Išsaugoti dokumentą prieš išeinant iš programos?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Išeiti neišsaugant"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Mažiau"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Daugiau"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Mažiausia"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Didžiausia"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Saugomas dokumentas..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saugomas puslapis %d iš %d"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Skaitytuvo kryptis per skaitomą puslapį."
diff --git a/po/lv.po b/po/lv.po
index 08f3575..a93f10f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-10-07 21:28+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizēties"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Res_ursa lietotājvārds:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Parole:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teksts"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Priekšpuse un aizmugure"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Priekšpuse"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Aizmugure"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Vienkārša skenēšana"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokuments"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_enēt"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Viena la_pa"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Visas lapas no _padeves"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Apturēt _skenēšanu"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teksts"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-pasts"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "La_pa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Ap_cirst"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Pag_riezt apciršanu"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Pārvietot pa kreisi"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Palīdzība"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Saturs"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Sākt jaunu dokumentu"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Jauns"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Ieskenēt vienu lapu no skenera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skenēt"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Saglabāt"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Apturēt pašreizējo skenēšanu"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Apturēt"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Pagriezt pa kreisi"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Pagriezt pa labi"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Apcirst izvēlēto lapu"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Apcirst"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Res_ursa lietotājvārds:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Parole:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizēties"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Iestatījumi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skenēšanas av_ots:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Teksta izšķirtspēja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Fotogrāfijas izšķirts_pēja:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skenējamā puse:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Lapas izmērs:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Gaišums:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrasts:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Priekšpuse un aizmugure"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Priekšpuse"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Aizmugure"
+msgid "Quality:"
+msgstr "Kvalitāte:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skenēt dokumentus"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Loga platums pikseļos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Loga augstums pikseļos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Ierīce, no kuras skenēt"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE ierīce, no kuras iegūt attēlus."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Skenējamā dokumenta veids"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Skenējamā dokumenta veids. Šīs iestatījums nosaka skenēšanas izšķirtspēju, "
 "krāsas un pēcapstrādi."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Skenēšanas virziens"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Skenera virziens pāri skenējamai lapai."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Skenētā attēla platums pikseļos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Skenētā attēla platums pikseļos. Šī vērtība tiek atjaunināta uz pēdējās "
-"skenētās lapas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Skenētā attēla augstums pikseļos"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Skenētā attēla augstums pikseļos. Šī vērtība tiek atjaunināta, ņemot vērā "
-"pēdējo skenēto lapu."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Papīra platums mm desmitdaļās"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,101 +323,93 @@ msgstr ""
 "Papīra platums mm desmitdaļās (vai 0 automātiskai papīra biezuma "
 "noteikšanai)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Papīra garums mm desmitdaļās"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papīra garums mm desmitdaļās (vai 0 automātiskai papīra biezuma noteikšanai)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Skenējuma gaišums"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Gaišuma pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Skenējuma kontrasts"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Pēdējā skenētā attēla izšķirtspēja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
+msgstr "Kontrasta pielāgojums no -100 līdz 100 (0 nozīmē nekāds)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Teksta skenējumu izšķirtspēja"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Fotogrāfiju skenējumu izšķirtspēja"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Skenējamā lapas puse"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Skenējamās lapas puse."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Direktorija, kurā saglabāt datnes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Direktorija, kurā saglabāt datnes. Pēc noklusējuma datnes tiks glabātas "
 "dokumentu direktorijā."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Kvalitātes vērtība, ko izmantot JPEG saspiešanai."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Skeneris nav atrasts. Lūdzu, pievienojiet skeneri."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Neizdevās savienoties ar skeneri"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Neizdevās sākt skenēšanu"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Kļūda, sazinoties ar skeneri"
 
@@ -502,98 +450,110 @@ msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Aizvērt"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "At_celt"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Saglabāt"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Visas datnes"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Norādīt datnes _tipu"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Neizdevās saglabāt datni"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nevar saglabāt attēlu priekšskatīšanai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -619,112 +579,151 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Jānis-Marks Gailis https://launchpad.net/~jeanmarc-gailis\n"
 "  Pēteris Krišjānis https://launchpad.net/~pecisk-gmail\n"
 "  Rihards Pfeifle https://launchpad.net/~spr1nt3r\n"
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (augsta izšķirtspēja)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Pietrūkst datņu"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Lūdzu, pārbaudiet instalāciju"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Tumšāks"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Gaišāks"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Mazāk"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Vairāk"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimums"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimums"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Skenēšanas virziens"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Skenētā attēla augstums pikseļos"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Skenētā attēla platums pikseļos. Šī vērtība tiek atjaunināta uz pēdējās "
+#~ "skenētās lapas."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Skenētā attēla platums pikseļos"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Loga augstums pikseļos"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Loga platums pikseļos"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Pēdējā skenētā attēla izšķirtspēja"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Skenētā attēla augstums pikseļos. Šī vērtība tiek atjaunināta, ņemot vērā "
+#~ "pēdējo skenēto lapu."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Skenera virziens pāri skenējamai lapai."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
diff --git a/po/mhr.po b/po/mhr.po
index c11e8a7..44f4221 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Mari (Meadow) <mhr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:47+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 08:00+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Шолыпмут:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Текст"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Фотосӱрет"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Шрифт"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Ик _лаштык"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Текст"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Фотосӱрет"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Лаштык"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
-msgstr ""
+msgstr "_Лектыш"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
-msgstr ""
+msgstr "_Иктат"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
-msgstr "US _Letter"
+msgstr "_Серыш"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
-msgstr ""
+msgstr "_Йӱла"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Шола"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Пурла"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Полышык"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
-msgstr ""
+msgstr "_Содержаний"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "У"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Аныклаш"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Шогалташ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
-msgstr ""
-
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Шолыпмут:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
+msgstr "Лектыш"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Лаштыкын кугыт"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Шрифт"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr ""
+msgid "Quality:"
+msgstr "Ыштыш-кучыш:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -476,7 +428,7 @@ msgstr ""
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Сканироватлыме документ"
 
 #. Arguments and description for --help text
 #: ../src/simple-scan.vala:529
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,110 +561,108 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Max Romanov https://launchpad.net/~dr-max-romanov"
+"  Max Romanov https://launchpad.net/~dr-max-romanov\n"
+"  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
diff --git a/po/ms.po b/po/ms.po
index 192201c..ddda89f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Benarkan"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Nama pengguna untuk sumber:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Katalaluan:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teks"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Hadapan dan Belakang"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Hadapan"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Ke belakang"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Pengimbas Ringkas"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokumen"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "I_mbas"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Halaman Tunggal"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Semua Halaman Dari _Suapan"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Henti Imbas"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teks"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Emel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Putar Ke Ki_ri"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Putar Ke Ka_nan"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Tiada"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Tersendiri"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Putar & Kerat"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Alih Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "ALih Ke Kanan"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Bantuan"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Kandungan"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Mulakan dokumen baru"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Baru"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Imbas halaman tunggal dari pengimbas"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Imbas"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Simpan"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Hentikan Imbasan semasa"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Henti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (lawan-jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Putar Ke Kiri"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (arah-jam)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Putar Ke Kanan"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Kerat halaman pilihan"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Kerat"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Nama pengguna untuk sumber:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Katalaluan:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Benarkan"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Keutamaan"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Imbas Sisi:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Saiz Halaman:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Beza Jelas:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kualiti:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Hadapan dan Belakang"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Hadapan"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Ke belakang"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Imbas Dokumen"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Lebar tetingkap dalam piksel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Tinggi tetingkap dalam piksel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "BENAR jika tetingkap aplikasi dimaksimakan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Peranti untuk diimbas dari"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Peranti SANE untuk memperoleh imej dari."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Jenis dokumen yang diimbas"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Jenis dokumen yang akan diimbas. Tetapan ini menentukan resolusi, warna dan "
 "post-pemproses imbasan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Arah imbasan"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Arah pengimbas merentasi halaman terimbas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Lebar imej terimbas dalam piksel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Lebar imej yang diimbas dalam piksel. Nilai ini dikemaskini berdasarkan "
-"halaman yang terakhir diimbas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Tinggi imej terimbas dalam piksel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Tinggi imej yang diimbas dalam piksel. Nilai ini dikemaskini merujuk pada "
-"halaman yang terakhir diimbas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Lebar kertas dalam persepuluh mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Lebar kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
 "automatik)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Tinggi ketar dalam persepuluh mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,90 +335,82 @@ msgstr ""
 "Tinggi kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
 "automatik)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Kecerahan imbasan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Pelarasan kecerahan dari -100 hingga 100 (0 tiada perubahan)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Beza jelas imbasan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Pelarasan beza jelas dari -100 hingga 100 (0 tiada perubahan)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolusi imej terakhir yang diimbas"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Resolusi dalam titik-se-inci imej yang terdahulu diimbas."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolusi untuk imbasan teks"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas teks."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolusi untuk imbasan foto"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas foto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Sisi halaman untuk diimbaskan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Sisi halaman untuk diimbas."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Direktori untuk menyimpan fail ke"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Direktori untuk menyimpan fail. Nilai lalai direktori dokumen jika tidak "
 "ditetapkan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Tiada pengimbas hadir. Sila sambungkan pengimbas."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Tidak boleh menyambung kepada pengimbas"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Tidak boleh memulakan imbasan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Ralat berkomunikasi dengan pengimbas"
 
@@ -503,98 +451,110 @@ msgstr ""
 "Jalankan '%s --help' untuk melihat senarai penuh pilihan baris perintah yang "
 "ada."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Tutup"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata laluan diperlukan untuk mencapai '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Tiada pengimbas dikesan"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Batal"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Simpan"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Fail Imej"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Semua Fail"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Pilih Jenis _Fail"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen berbilang-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Gagal menyimpan fail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika anda tidak simpan, semua perubahan akan hilang."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -623,16 +583,16 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,98 +603,104 @@ msgstr ""
 "  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Fail hilang"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Sila semak pemasangan anda"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Arah imbasan"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "BENAR jika tetingkap aplikasi dimaksimakan"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolusi imej terakhir yang diimbas"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -742,6 +708,18 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "Arah pengimbas menerusi halaman yang diimbas. Ia boleh jadi salah satu yang "
 #~ "berikut: 'atas-ke-bawah' 'bawah-ke-atas' 'kiri-ke-kanan' 'kanan-ke-kiri'"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Tinggi imej terimbas dalam piksel"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Lebar imej terimbas dalam piksel"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Lebar tetingkap dalam piksel"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Tinggi tetingkap dalam piksel"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -751,11 +729,28 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "  %s [DEVICE...] - Utiliti pengimbasan"
 
 #~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Lebar imej yang diimbas dalam piksel. Nilai ini dikemaskini berdasarkan "
+#~ "halaman yang terakhir diimbas."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Tinggi imej yang diimbas dalam piksel. Nilai ini dikemaskini merujuk pada "
+#~ "halaman yang terakhir diimbas."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Sisi halaman untuk diimbaskan. ia boleh salah satu seperti berikut: 'kedua-"
 #~ "dua' 'hadapan' 'belakang'"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Resolusi dalam titik-se-inci imej yang terdahulu diimbas."
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -799,3 +794,6 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "  --sync Lakukan penyegerakan panggilan X\n"
 #~ "  --gtk-module=MODULES Muat modul GTK+ tambahan\n"
 #~ "  --g-fatal-warnings Jadikan semua amaran mati"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Arah pengimbas merentasi halaman terimbas."
diff --git a/po/my.po b/po/my.po
index d8b261b..c211637 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Burmese <my@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_A ခွင့်ပြုခြင်း"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Username for resource:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Pစကားဝှက်"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "စာ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "ဓာတ်ပုံ"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "အရှေ့နှင့်အနောက်"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "အရှေ့"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "နောက်သို့"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "ရိုးရိုး Scan ဖတ်ခြင်း"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dစာရွက်စာတမ်း"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sc_an"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_P ရိုးရိုး Scan ဖတ်ခြင်း"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_S Scan ရပ်မည်။"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "စာ"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "ဓာတ်ပုံ"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Eအီးမေး"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pစာမျက်နှာ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "_R ညာဖက်သို့လှည့်မည်။"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_C ဖြတ်ပါ။"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Nဘာမှမဟုတ်"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_L စာ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "ဘယ်ဖက်သို့ရွှေ့ပါ။"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "ညာဖက်သို့ရွှေ့ပါ။"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_H အကူအညီ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_  C ခေါင်းစဉ်"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "အသစ်စတင်ရန်"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "အသစ်"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "ရပ်မည်"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "စာမျက်နှာကို ဘယ်ဖက်သို့လှည့်ပါ။(နာရီလက်တံပြောင်းပြန်)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "ဘယ်ဖက် လှည့်ပါ။"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "စာမျက်နှာကို ညာဖက်သို့လှည့်ပါ။ (နာရီလက်တံ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "ညာဖက်လှည့်ပါ။"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "ရွေးချယ်ထားသောစာမျက်နှာကို ဖြတ်ပါ။"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Username for resource:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Pစကားဝှက်"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_A ခွင့်ပြုခြင်း"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Pဓာတ်ပုံ resolution-"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "စာရွက်အရွယ်အစား"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "အရှေ့နှင့်အနောက်"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "အရှေ့"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "နောက်သို့"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Window width in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Window height in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE if the application window is maximized"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE device to acquire images from."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Scan ဖတ်မည့် စာရွက်စာတမ်း အမျိုးအစား"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Scan ၏ လားရာ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "The direction of the scanner across the scanned page."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Width of scanned image in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Height of scanned image in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Width of paper in tenths of a mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Height of paper in tenths of a mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,89 +335,81 @@ msgstr ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolution of last scanned image"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "The resolution in dots-per-inch of the previously scanned image."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolution for text scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "The resolution in dots-per-inch to use when scanning text."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolution for photo scans"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "The resolution in dots-per-inch to use when scanning photos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Page side to scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "The page side to scan."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ဖိုင်ကိုသိမ်းရန်အတွက်နေရာ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "The directory to save files to. Defaults to the documents directory if unset."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Scanner နှင့်ချိတ်ဆက်ထားခြင်းမရှိပါ။ Scanner နှင့်ချိတ်ဆက်ပါ။"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Scanner နှင့်မချိတ်ဆက်နိုင်ပါ။"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Scan မစတင်နိုင်ပါ။"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Scanner နှင့်ချိတ်ဆက်ရင်းအမှားအယွင်းဖြစ်ခဲ့သည်။"
 
@@ -500,100 +448,112 @@ msgstr "[DEVICE...] - Scanning utility"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Save As..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "_T ဖိုင်အမျိုးအစားရွေးပါ။"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "ဖိုင်ကိုမသိမ်းဖြစ်ပါ။"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "မသိမ်းပါက၊ ပြောင်းလဲမူများသည် လုံးဝပျက်သွားပါလိမ့်မည်။"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -622,16 +582,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -639,94 +599,132 @@ msgstr ""
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "ဖိုင်များပျောက်နေပါသည်။"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "သင်၏ စက်ထဲသို့သွင်းခြင်းကို ပြန်လည်စစ်ဆေးပါ။"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Height of scanned image in pixels"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Scan ၏ လားရာ"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "The direction of the scanner across the scanned page."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE if the application window is maximized"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolution of last scanned image"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Window height in pixels"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "The resolution in dots-per-inch of the previously scanned image."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Width of scanned image in pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Window width in pixels"
diff --git a/po/nb.po b/po/nb.po
index 4eeace6..43c6fd2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
-"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
+"Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autoriser"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Brukernavn for ressurs:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Passord:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Bilde"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "For- og bakside"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Forside"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Bakside"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_ann"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Enkel _side"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Stopp skanning"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Bilde"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Ny"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skann én enkel side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stopp"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Roter mot venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roter siden til høyre (med urviseren)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Roter mot høyre"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Beskjær"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Brukernavn for ressurs:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Passord:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autoriser"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Innstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Hent fra:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Tekstoppløsning"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Bildeoppløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skann side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "For- og bakside"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Forside"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Bakside"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skann dokumenter"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Vindusbredde i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Vindushøyde i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "SANN hvis programvinduet er maksimert"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Enhet det skal skannes fra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhet som bilder skal hentes fra."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Dokumenttype som skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,143 +311,104 @@ msgstr ""
 "Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
 "og etterbehandling."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Skanneretning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Retningen til scanneren over den scannede siden."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Bredde på skannet bilde, i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Bredden på skannede bilder, i pixler. Denne verdien settes til størrelsen "
-"fra sist skannede side."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Høyde på skannede bilder, i pixler"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Høyden på skannet bilde, i pixler. Verdien settes til sist skannede side."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Papirbredde i tiendels millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Papirhøyde i tiendels millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Skanningens ysstyrke"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Skanningens kontrastforsterkning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 "Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
 "forsterkning)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Oppløsning på sist skannede bilde"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Oppløsning for tekstskanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Oppløsning for bildeskanning"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Side som skal skannes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Siden som skal scannes."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Lagre filer i mappe"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgjengelig. Vennligst koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
@@ -500,98 +449,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Lukk"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Lagre som..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Lagre"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Velg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Kunne ikke lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -620,16 +581,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -641,98 +602,104 @@ msgstr ""
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Manglende filer"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Vennligst undersøk installasjonen"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Høyde på skannede bilder, i pixler"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Skanneretning"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Oppløsning på sist skannede bilde"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -749,6 +716,34 @@ msgstr "Lagrer side nr. %d av %d"
 #~ "Denne innstillinger bestemmer oppløsning, farger og etterbehandling for "
 #~ "skanningen."
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Bredden på skannede bilder, i pixler. Denne verdien settes til størrelsen "
+#~ "fra sist skannede side."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Høyden på skannet bilde, i pixler. Verdien settes til sist skannede side."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "SANN hvis programvinduet er maksimert"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Vindushøyde i pixler"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Vindusbredde i pixler"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Bredde på skannet bilde, i pixler"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -800,3 +795,6 @@ msgstr "Lagrer side nr. %d av %d"
 #~ msgstr ""
 #~ "Siden som skal skannes. Det kan være én av følgende: 'begge' 'forside' "
 #~ "'bakside'"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Retningen til scanneren over den scannede siden."
diff --git a/po/nl.po b/po/nl.po
index ec68db7..1bf6d58 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "Toest_aan"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Gebr_uikersnaam voor bron:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Wachtwoord:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Voor- en achterzijde"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Voorzijde"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Achterzijde"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Scannen"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sc_annen"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Enkele _pagina"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alle pagina's van in_voer"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Scan _stoppen"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-mailen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Bijsnijden d_raaien"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Een nieuw document beginnen"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nieuw"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Een enkele pagina scannen"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Opslaan"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stoppen"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "De pagina linksom draaien (tegen de klok in)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "De pagina rechtsom draaien (met de klok mee)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "De geselecteerde pagina bijsnijden"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Gebr_uikersnaam voor bron:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Wachtwoord:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "Toest_aan"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Scanner:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Tekstresolutie:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Fotoresolutie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Scangrootte:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Paginagrootte:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Helderheid:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kwaliteit:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Voor- en achterzijde"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Voorzijde"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Achterzijde"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Documenten scannen"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Vensterbreedte in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Vensterhoogte in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE als het programmavenster gemaximaliseerd is"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Te gebruiken scanapparaat"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-apparaat om beeld van te ontvangen"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Type document dat gescand wordt"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
 "resolutie, kleuren en nabewerking."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Scanrichting"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "De richting van de scanner over de te scannen pagina."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Breedte van gescande afbeelding in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"De breedte van de gescande afbeelding in pixels. Deze waarde representeert "
-"de laatst gescande pagina."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Hoogte van gescande afbeelding in pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"De hoogte van de gescande afbeelding in pixels. Deze waarde representeert de "
-"laatst gescande pagina."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Breedte van het papier in tienden van een mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "De breedte van het papier in tienden van een mm (of 0 voor automatische "
 "papierdetectie)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Hoogte van het papier in tienden van een mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,97 +335,88 @@ msgstr ""
 "De hoogte van het papier in tienden van een mm (of 0 voor automatische "
 "papierdetectie)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Helderheid van de scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contrast van de scan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolutie van laatste gescande afbeelding"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"De resolutie in punten-per-inch (dtp) van de vorige gescande afbeelding."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolutie voor gescande tekst"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
 "tekst."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolutie voor gescande foto's"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
 "foto's."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Te scannen paginazijde"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "De paginazijde om te scannen."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Map om bestanden in op te slaan"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "De map waarin bestanden worden opgeslagen. Dit is standaard de map "
 "Documenten indien niet ingesteld."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Geen scanners beschikbaar. Sluit een scanner aan om dit programma te "
 "gebruiken."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Kan niet verbinden met de scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Kan de scan niet starten"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Fout tijdens het communiceren met de scanner"
 
@@ -512,98 +459,110 @@ msgstr ""
 "Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
 "zien."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Sluiten"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Opslaan als..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Opslaan"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Bestands_type selecteren"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -634,16 +593,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -658,104 +617,101 @@ msgstr ""
 "  Sven Vranckx https://launchpad.net/~sven-vranckx\n"
 "  Tico https://launchpad.net/~co-ti\n"
 "  Tino Meinen https://launchpad.net/~a-t-meinen\n"
-"  Wouter Bolsterlee (uws) https://launchpad.net/~uws\n"
+"  Wouter Bolsterlee https://launchpad.net/~uws\n"
 "  cumulus007 https://launchpad.net/~cumulus-007\n"
 "  kay https://launchpad.net/~kay20\n"
 "  rob https://launchpad.net/~rvdb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Ontbrekende bestanden"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Controleer uw installatie"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Donkerder"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Lichter"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Minder"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Meer"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -786,6 +742,18 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "  --gtk-module=MODULES            Aanvullende GTK+-modules laden\n"
 #~ "  --g-fatal-warnings              Alle waarschuwingen fataal maken"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE als het programmavenster gemaximaliseerd is"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Scanrichting"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Vensterhoogte in pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Vensterbreedte in pixels"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -818,7 +786,37 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "Type document dat gescand wordt. 'text' voor tekstdocumenten, 'photo' voor "
 #~ "foto's. Deze instelling bepaalt de scanresolutie, de kleuren en naverwerking."
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Hoogte van gescande afbeelding in pixels"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert de "
+#~ "laatst gescande pagina."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "De resolutie in punten-per-inch (dtp) van de vorige gescande afbeelding."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolutie van laatste gescande afbeelding"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "De breedte van de gescande afbeelding in pixels. Deze waarde representeert "
+#~ "de laatst gescande pagina."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Breedte van gescande afbeelding in pixels"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "De te scannen paginazijde. Mogelijke waarden zijn ‘both’, ‘front’ en ‘back’."
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "De richting van de scanner over de te scannen pagina."
diff --git a/po/oc.po b/po/oc.po
index 49378d7..536299a 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,316 +7,304 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-07-23 09:04+0000\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2013-10-15 16:43+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Utilizaire :"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "Sen_hal :"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tèxte"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fòto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Recto verso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Fàcia"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Precedenta"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Aisina de numerizacion simpla"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Nu_merizar"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Pagina unica"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Totas las paginas del _nauc"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Arrestar la numerizacion"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tèxte"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fòto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Corrièl"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Pivotar cap a es_quèrra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Re_quadrar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Pas cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4 &#xD7; 6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Pivota_r la seleccion"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr ""
+msgstr "Se desplaçar cap a esquèrra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr ""
+msgstr "Se desplaçar cap a drecha"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Ensenhador"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Crear un document novèl"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Novèl"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Numerizar una sola pagina dempuèi lo scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Numerizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Enregistrar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Arrestar la numerizacion en cors"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Arrèsta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 "Pivotar la pagina cap a esquèrra (sens invèrse de las agulhas d'una mòstra)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rotacion a esquèrra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pivotar la pagina cap a drecha (sens de las agulhas d'una mòstra)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rotacion a drecha"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Requadrar la pagina seleccionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Requadrar"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Utilizaire :"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "Sen_hal :"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferéncias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Resolucion del _Tèxte :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Resolucion de la _fòto :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Fàcia de numerizar :"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Talha de la pagina :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Luminositat :"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Recto verso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Fàcia"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Precedenta"
+msgid "Quality:"
+msgstr "Qualitat :"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Numerizar de documents"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Largor de la fenèstra en pixèls"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Nautor de la fenèstra en pixèls"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERAI se la fenèstra de l'aplicacion es maximizada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Numerizar dempuèi"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Periferic SANE d'utilizar per l'aquisicion dels imatges."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Natura del document que va èsser numerizat"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -324,43 +312,11 @@ msgstr ""
 "Tipe de document numerizat. Aqueste reglatge definís la resolucion de "
 "numerizacion, las colors e lo post-tractament."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Sens de numerizacion"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Lo sens de l'escanèr per rapòrt a la pagina numerizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Largor de l'imatge numerizat en pixèls"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La largor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
-"foncion de la darrièra pagina numerizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Nautor de l'imatge numerizat en pixèls"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"La nautor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
-"foncion de la darrièra pagina numerizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Largor del papièr en desens de mm."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -368,11 +324,11 @@ msgstr ""
 "La largor del papièr en desens de mm (o 0 per una deteccion automatica del "
 "papièr)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Nautor del papièr en desens de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -380,94 +336,86 @@ msgstr ""
 "La nautor del papièr en desens de mm (o 0 per una deteccion automatica del "
 "papièr)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Luminositat de la numerizacion"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Ajustament de la luminositat de -100 a 100 (0 per pas cap)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste de la numerizacion"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Ajustament del contraste de -100 a 100 (0 per pas cap)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolucion del darrièr imatge numerizat"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "La resolucion del darrièr imatge numerizat en punts per poce."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolucion per de numerizacions de tèxtes"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
 "tèxte."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolucion per de numerizacions de fòtos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
 "fòtos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Fàcia(s) de la pagina de numerizar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Lo costat de la pagina de numerizar."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Dorsièr ont los fichièrs son enregistrats"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Lo dorsièr ont los fichièrs son enregistrats. S'es pas definit, lo dorsièr "
 "documents serà utilizat per defaut."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Taus de qualitat d'utilizar per la compression JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Taus de qualitat d'utilizar per la compression JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Cap de periferic de numerizacion pas disponible. Connectatz-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connectar al scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Impossible d'aviar la numerizacion"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Error de comunicacion amb lo scanner"
 
@@ -509,98 +457,110 @@ msgstr ""
 "Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
 "linha de comanda"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Tampar"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilizaire e senhal necessaris per accedir a « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "A_nullar"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Salvar"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Seleccionatz lo _tipe de fichièr"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrar lo fichièr"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrar l'imatge per lo previsualizar"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -630,16 +590,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -647,98 +607,104 @@ msgstr ""
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Fichièrs mancants"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Verificatz vòstra installacion"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maximum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4 &#xD7; 6"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Nautor de l'imatge numerizat en pixèls"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Sens de numerizacion"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolucion del darrièr imatge numerizat"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -756,6 +722,35 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ "« fòto » per las fotografias. Aquel paramètre determina la resolucion de la "
 #~ "numerizacion, lo nombre de colors e los tractaments posteriors."
 
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "La nautor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
+#~ "foncion de la darrièra pagina numerizada."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERAI se la fenèstra de l'aplicacion es maximizada"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "La resolucion del darrièr imatge numerizat en punts per poce."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "La largor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
+#~ "foncion de la darrièra pagina numerizada."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Nautor de la fenèstra en pixèls"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Largor de la fenèstra en pixèls"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Largor de l'imatge numerizat en pixèls"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -806,3 +801,6 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ msgstr ""
 #~ "La o las fàcias de la pagina de numerizar. Aquò pòt èsser : « Recto verso », "
 #~ "« Recto » o « Verso »"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Lo sens de l'escanèr per rapòrt a la pagina numerizada."
diff --git a/po/pa.po b/po/pa.po
index 2dfffca..e359547 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,452 +7,404 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "ਪਰਮਾਣਿਤ(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "ਟੈਕਸਟ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "ਫੋਟੋ"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "ਅੱਗੇ"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "ਪਿੱਛੇ"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "ਸੌਖਾ ਸਕੈਨ"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "ਡੌਕੂਮੈਂਟ(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "ਸਕੈਨ ਕਰੋ(_a)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "ਇੱਕਲਾ ਸਫ਼ਾ(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "ਟੈਕਸਟ"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "ਫੋਟੋ"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "ਈਮੇਲ(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "ਸਫ਼ਾ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "ਕਰੋਪ ਕਰੋ(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "ਕੁਝ ਨਹੀਂ(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "ਪੱਤਰ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "ਲੀਗਲ(_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "ਨਵਾਂ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "ਸਕੈਨਰ ਤੋਂ ਇੱਕਲਾ ਸਫ਼ਾ ਸਕੈਨ ਕਰੋ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "ਸਕੈਨ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "ਪਾਸਵਰਡ(_P):"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "ਪਰਮਾਣਿਤ(_A)"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "ਸਕੈਨ ਸਾਈਡ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "ਸਫਾ ਆਕਾਰ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "ਅੱਗੇ"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "ਪਿੱਛੇ"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "ਸਕੈਨ ਦੀ ਦਿਸ਼ਾ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "ਟੈਕਸਟ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ "
 "ਹੈ।"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "ਸਕੈਨਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
@@ -491,98 +443,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ਜੇ ਤੁਸੀਂ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਸਭ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -599,114 +563,114 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A S Alam https://launchpad.net/~aalam-users"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "ਸਕੈਨ ਦੀ ਦਿਸ਼ਾ"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -714,3 +678,6 @@ msgstr ""
 #~ msgstr ""
 #~ "ਵਰਤੋਂ:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
diff --git a/po/pl.po b/po/pl.po
index f209f54..770b8f3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2013-09-11 23:15+0000\n"
-"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2014-01-25 19:21+0000\n"
+"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "Upow_ażnij"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Nazwa _użytkownika dla zasobu:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Hasło:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Zdjęcie"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Przód i tył"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Przód"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Tył"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Proste skanowanie"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_anowanie"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Pojedyncza strona"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "_Wszystkie strony z podajnika"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Zatrzymaj _skanowanie"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Zdjęcie"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Przytnij"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4x6\""
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Własny"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Ob_róć obszar przycięcia"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Spis treści"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Tworzy nowy dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nowy"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skanuje pojedynczą stronę ze skanera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skanuj"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Zapisz"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obraca stronę w lewo (przeciwnie do wskazówek zegara)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obraca stronę w prawo (zgodnie ze wskazówkami zegara)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Przycina wybraną stronę"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Przytnij"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Nazwa _użytkownika dla zasobu:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Hasło:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "Upow_ażnij"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferencje"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Źródło skan_owania:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Rozdzielczość tekstu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Rozdzielczość z_djęcia:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skanowanie stron:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Rozmiar strony:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Jasność:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Jakość:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Przód i tył"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Przód"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Tył"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skanowanie dokumentów"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Szerokość okna w pikselach"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Wysokość okna w pikselach"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Wartość \"True\", jeśli okno programu jest zmaksymalizowane"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Urządzenie skanujące"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Urządzenie SANE do pobierania obrazu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Typ skanowanego dokumentu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
 "skanowania, kolorach i przetwarzaniu końcowym."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Kierunek skanowania"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Kierunek skanowania strony."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Szerokość zeskanowanego obrazu w pikselach"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Szerokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
-"tej, jaka wynosiła podczas ostatniego skanowania."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Wysokość zeskanowanego obrazu w pikselach"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Wysokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
-"tej, jaka wynosiła podczas ostatniego skanowania."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Szerokość papieru w dziesiątkach milimetrów"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
 "wykrywania papieru)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Wysokość papieru w dziesiątkach milimetrów"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,92 +335,84 @@ msgstr ""
 "Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
 "wykrywania papieru)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Jasność skanowania"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Kontrast skanowania"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Rozdzielczość ostatnio skanowanego obrazu w punktach na cal (dpi)."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Rozdzielczość skanowanego tekstu"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (dpi)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Rozdzielczość skanowanych zdjęć"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (dpi)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Strona do skanowania"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Strona kartki do skanowania."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Katalog do zapisania plików"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
 "katalogu Dokumenty."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Wartość jakości używana do kompresji JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Wartość jakości używana do kompresji JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Brak dostępnych skanerów. Proszę podłączyć skaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nie można połączyć się ze skanerem"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nie można rozpocząć skanowania"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Błąd podczas komunikacji ze skanerem"
 
@@ -503,98 +451,110 @@ msgstr "[URZĄDZENIE] - Narzędzie do skanowania"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "Za_mknij"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Uzyskanie dostępu do \"%s\" wymaga podania nazwy użytkownika i hasła"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Zapisz"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Proszę wybrać _typ pliku"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nie można zapisać podglądu obrazu"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -626,16 +586,16 @@ msgstr ""
 "- proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -659,98 +619,95 @@ msgstr ""
 "  tomko222 https://launchpad.net/~tomko222"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (domyślnie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (szkic)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (wysoka rozdzielczość)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Nie można odnaleźć plików"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Proszę sprawdzić poprawność instalacji"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Zapisywanie dokumentu..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4x6\""
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -759,6 +716,15 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "Użycie:\n"
 #~ "  %s [URZĄDZENIE...] - Narzędzie do skanowania"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Wysokość zeskanowanego obrazu w pikselach"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Kierunek skanowania"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -777,6 +743,35 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "tekstowych, \"photo\" (zdjęcie) dla zdjęć. To ustawienie decyduje o "
 #~ "rozdzielczości skanowania, kolorach i możliwości późniejszej obróbki."
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Szerokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
+#~ "tej, jaka wynosiła podczas ostatniego skanowania."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Wysokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
+#~ "tej, jaka wynosiła podczas ostatniego skanowania."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Wartość \"True\", jeśli okno programu jest zmaksymalizowane"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Rozdzielczość ostatnio skanowanego obrazu w punktach na cal (dpi)."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Wysokość okna w pikselach"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Szerokość okna w pikselach"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Szerokość zeskanowanego obrazu w pikselach"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -820,3 +815,6 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "  --sync                          Synchroniczne wywołania X\n"
 #~ "  --gtk-module=MODUŁY             Wczytuje dodatkowe moduły biblioteki GTK+\n"
 #~ "  --g-fatal-warnings              Wszystkie ostrzeżenia są krytyczne"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Kierunek skanowania strony."
diff --git a/po/pt.po b/po/pt.po
index ce79454..e33dcac 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-08-28 14:11+0000\n"
 "Last-Translator: Gusrubin <gusrubin@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Nome do _utilizador para o recurso:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Palavra-Passe:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Texto"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Frente e Verso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Frente"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Digitalização Simples"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Digit_alizar"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Página Única"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas a partir do _Alimentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Parar Digitalização"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Texto"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rodar para a _Esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rodar para a _Direita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Cortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rodar Recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mover para a Esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mover para a Direita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Conteúdos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Parar a digitalização actual"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rodar para a Esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rodar a página para a direita (ponteiros do relógio)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rodar para a Direita"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Cortar a página selecionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Recortar"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Nome do _utilizador para o recurso:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Palavra-Passe:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Origem da Digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Resolução do _Texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Resolução da Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Lado da digitalização"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Tamanho da Página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Frente e Verso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Frente"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Verso"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Digitalizar Documentos"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Largura da janela em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Altura da janela em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADE se a janela da aplicação está maximizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE para obter imagens"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipo do documento a ser digitalizado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,147 +311,106 @@ msgstr ""
 "Tipo de documento a ser digitalizado. Esta configuração decide sobre a "
 "resolução de digitalização, cores e pós-processamento."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direcção da digitalização"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "A direção do scanner através da página digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Largura da imagem digitalizada em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A largura da imagem digitalizada em pixels. Este valor é actualizado com o "
-"valor da última imagem que foi digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Altura da imagem digitalizada em pixeis"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"A altura da imagem digitalizada em pixels. Este valor é actualizado com o "
-"valor da última página digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Largura do papel em milímetros"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "A largura do papel em milimetros (ou 0 para detecção automática de papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Altura da folha em décimos de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "A altura do papel em milímetros (ou 0 para detecção automática de papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Brilho da digitalização"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "O ajuste do brilho desde -100 a 100 (0 sendo nenhum)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste da digitalização"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "O ajuste do contraste desde -100 a 100 (0 sendo nada)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolução da última imagem digitalizada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"A resolução em pontos-por-polegada da imagem anteriormente digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolução para digitalização de textos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "A resolução em pontos-por-polegada a ser usada quando digitalizar texto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolução para digitalização de fotos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "A resolução em pontos-por-polegadas  a ser usada quando digitalizar fotos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Lado da página a digitalizar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "O lado da página para digitalizar."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Pasta para guardar os ficheiros"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "O directório no qual salvar os ficheiros. Usa o directório de documentos "
 "predefinido se não for configurado."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Valor de qualidade a usar na compressão JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Valor de qualidade a usar na compressão JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nenhum digitalizador disponível. Por favor, ligue um scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Impossível ligar ao scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Não é possível iniciar a digitalização"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Erro de comunicação com scanner"
 
@@ -505,98 +452,110 @@ msgstr ""
 "Execute '%s --help' para consultar uma lista completa das opções de linha de "
 "comando disponíveis."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Documento Digitalizado.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "Fechar"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário utilizador e palavra-passe para aceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nenhum scanner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique se o seu scanner está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Guardar Como..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "Cancelar"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "Guardar"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Seleccionar _Tipo de ficheiro"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-página)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Falhou ao guardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se não guardar, as alteração serão perdidas permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Guardar documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Descartar Alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Incapaz de gravar imagem para pré-visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o ficheiro da ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -626,16 +585,16 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalização Simples (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -667,98 +626,95 @@ msgstr ""
 "  styluss https://launchpad.net/~styluss"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Sair SEM Guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Ficheiros em falta"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Por favor, verifique a sua instalação"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -767,6 +723,18 @@ msgstr "A guardar a página %d de %d"
 #~ "Utilização:\n"
 #~ "  %s [DISPOSITIVO...] - Utilitário de digitalização"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Altura da imagem digitalizada em pixeis"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direcção da digitalização"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolução da última imagem digitalizada"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERDADE se a janela da aplicação está maximizada."
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -776,6 +744,13 @@ msgstr "A guardar a página %d de %d"
 #~ "'direita para esquerda'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "A altura da imagem digitalizada em pixels. Este valor é actualizado com o "
+#~ "valor da última página digitalizada."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
@@ -790,6 +765,23 @@ msgstr "A guardar a página %d de %d"
 #~ "'foto' para fotos. Este ajuste define a resolução de digitalização, cores e "
 #~ "pós-processamento."
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "A largura da imagem digitalizada em pixels. Este valor é actualizado com o "
+#~ "valor da última imagem que foi digitalizada."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "A resolução em pontos-por-polegada da imagem anteriormente digitalizada."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Altura da janela em pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Largura da janela em pixels"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -806,6 +798,9 @@ msgstr "A guardar a página %d de %d"
 #~ "  --help-all                      Mostra todas as opções de ajuda\n"
 #~ "  --help-gtk                      Mostra as opções do GTK+"
 
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Largura da imagem digitalizada em pixels"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -827,3 +822,6 @@ msgstr "A guardar a página %d de %d"
 #~ "--sync                 Fazer a chamadas ao ecrã X sincronas\n"
 #~ "--gtk-module=MODULES   Carregar módulos GTK+ adicionais\n"
 #~ "--g-fatal-warnings     Tornar todos os avisos fatais"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "A direção do scanner através da página digitalizada."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index add4dbe..284cf17 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2013-04-16 12:21+0000\n"
 "Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizar"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Nome de _usuário para o recurso:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Senha:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Texto"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Frente e verso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Frente"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Verso"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Digitalizador simples"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Documento"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Digit_alizar"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Página única"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas do ali_mentador"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Par_ar digitalização"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Texto"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Re_cortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "Gira_r área recortada"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Conteúdo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Salvar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Parar a digitalização atual"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar a página à esquerda (sentido anti-horário)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Girar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar a página à direita (sentido horário)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Girar à direita"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Recortar a página selecionada"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Recortar"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Nome de _usuário para o recurso:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Senha:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizar"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Resolução da _foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Lado a digitalizar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Frente e verso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Frente"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Verso"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Largura da janela em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Altura da janela em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADEIRO se a janela do aplicativo estiver maximizada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo de onde o SANE adquirire imagens."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipo do documento a ser digitalizado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,54 +311,22 @@ msgstr ""
 "Tipo de documento a ser digitalizado. Esta configuração define a resolução "
 "da digitalização, cores e pós-processamento."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direção da digitalização"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "A direção em que o digitalizador percorre a página digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Largura da imagem digitalizada em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A largura da imagem digitalizada em pixels. Este valor é atualizado com o "
-"valor da última imagem que foi digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Altura da imagem digitalizada em pixels"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"A altura da imagem digitalizada em pixels. Este valor é atualizado com o "
-"valor da última página digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Largura do papel em décimos de milímetro"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Altura do papel em décimos de milímetro"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -378,94 +334,85 @@ msgstr ""
 "A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
 "papel)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Luminosidade do digitalizador"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "O ajuste de luminosidade de -100 para 100 (0 sendo nenhum)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Contraste do digitalizador"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "O ajuste do contraste de -100 para 100 (0 sendo nenhum)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Resolução da última imagem digitalizada"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"A resolução em pontos por polegada da imagem previamente digitalizada."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Resolução para digitalização de textos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "A resolução em pontos por polegada a ser usada na digitalização e textos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Resolução para digitalização de fotos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "A resolução em pontos por polegadas a ser usada na digitalização de fotos."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Lado da página a ser digitalizado"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "O lado da página a ser digitalizado."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Diretório para salvar arquivos"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "O diretório no qual salvar os arquivos. Se não configurado, o diretório "
 "Documentos é usado como padrão."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Qualidade para usar na compressão JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Qualidade para usar na compressão JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Nenhum digitalizador disponível. Por favor, conecte um digitalizador."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Não foi possível conectar-se ao digitalizador"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Não foi possível iniciar o digitalizador"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Erro na comunicação com o digitalizador"
 
@@ -507,98 +454,110 @@ msgstr ""
 "Execute '%s --help' para ver a lista completa de opções disponíveis para "
 "linha de comando."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "Fe_char"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário o nome de usuário e senha para acessar '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Salvar como..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Salvar"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Selecionar _tipo de arquivo"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se você não salvar, as alterações serão permanentemente perdidas."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Não é possível salvar imagem para visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,24 +587,26 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador simples"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Almufadado https://launchpad.net/~almufadado\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
 "  Benjamim Gois https://launchpad.net/~benjamim-gois\n"
+"  Celio Alves https://launchpad.net/~celio.alves\n"
 "  Celio Ricardo Quaio Goetten https://launchpad.net/~celioric\n"
 "  Celso H. L. S. Junior https://launchpad.net/~celsojunior\n"
+"  Fábio Nogueira https://launchpad.net/~fnogueira\n"
 "  Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade\n"
 "  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
 "  Pablo Diego Moço https://launchpad.net/~pablodm89\n"
@@ -661,98 +622,95 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Arquivos faltando"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Por favor verifique a sua instalação"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -783,6 +741,35 @@ msgstr "Salvando página %d de %d"
 #~ "Uso:\n"
 #~ "  %s [DISPOSITIVO...] - Utilitário de escaneamento"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Altura da imagem digitalizada em pixels"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Altura da janela em pixels"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Largura da janela em pixels"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Largura da imagem digitalizada em pixels"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "A resolução em pontos por polegada da imagem previamente digitalizada."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Resolução da última imagem digitalizada"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "A altura da imagem digitalizada em pixels. Este valor é atualizado com o "
+#~ "valor da última página digitalizada."
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direção da digitalização"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -821,3 +808,16 @@ msgstr "Salvando página %d de %d"
 #~ msgstr ""
 #~ "O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
 #~ "'frente' 'verso'"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "A largura da imagem digitalizada em pixels. Este valor é atualizado com o "
+#~ "valor da última imagem que foi digitalizada."
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "VERDADEIRO se a janela do aplicativo estiver maximizada"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "A direção em que o digitalizador percorre a página digitalizada."
diff --git a/po/ro.po b/po/ro.po
index 626737b..eb99bc2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,316 +7,304 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-09-11 18:43+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: ro\n"
 
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizează"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Numele de _utilizator pentru resursă:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Parolă:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Față și verso"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Față"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Verso"
+
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Scanare simplă"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Document"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sc_anează"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "O singură _pagină"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Toate paginile de la tava cu _foi de hârtie"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "Oprește _scanarea"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotește zona decupată"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Mută la stânga"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Ajutor"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Cuprins"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Începeți un document nou"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Scanați o singură pagină din scaner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Scanează"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Salvează"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Oprește scanarea curentă"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Oprește"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Decupează pagina selectată"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Decupează"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Numele de _utilizator pentru resursă:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Parolă:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizează"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Preferințe"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Rezoluție _text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Rezoluție _foto :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Partea scanată:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Dimensiunea paginii:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Față și verso"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Față"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Verso"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Scanează documente"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Lățimea ferestrei, în pixeli"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Înălțimea ferestrei, în pixeli"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "ADEVĂRAT dacă fereastra aplicației este mărită la maximum"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Dispozitiv de folosit pentru scanare"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Dispozitivul SANE din care se preiau imaginile."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Tipul de document scanat"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -324,54 +312,22 @@ msgstr ""
 "Tipul de document care va fi scanat. Această opțiune determină rezoluția de "
 "scanare, culoarea și post-procesarea."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Direcția scanării"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Direcția scanerului față de pagina scanată."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Lățimea imaginii scanate, în pixeli"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Lățimea imaginii scanate, în pixeli. Această valoare este actualizată la cea "
-"corespunzătoare paginii scanate precedent."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Înălțimea imaginii scanate, în pixeli"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Înălțimea imaginii scanate, în pixeli. Această valoare este actualizată la "
-"cea corespunzătoare paginii scanate precedent."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Lățimea hârtiei în zecimi de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Lățimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a hârtiei)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Înălțimea hârtiei în zecimi de mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,90 +335,82 @@ msgstr ""
 "Înălțimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a "
 "hârtiei)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Rezoluția ultimei imagini scanate"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Rezoluția în dpi (dots-per-inch) a imaginii scanate precedent."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Rezoluția pentru scanări text"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea de text."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Rezoluția pentru scanări foto"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea fotografiilor."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Partea de scanat a paginii"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Fața paginii care va fi scanată."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Dosarul în care să se salveze fișierele"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Dosarul în care să se salveze fișierele. Dacă nu este definit, fișierele "
 "sunt salvate în dosarul de documente."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nu există niciun scaner disponibil. Conectați un scaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nu s-a putut realiza conexiunea la scaner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
@@ -505,98 +453,110 @@ msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile mediului text."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Salvează ca..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Toate fișierele"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Alegeți _tipul de fișier"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -628,16 +588,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,98 +610,95 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Lipsesc fișierele"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Verificați instalarea"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -750,6 +707,21 @@ msgstr ""
 #~ "Utilizare:\n"
 #~ "  %s [DISPOZITIV...] - Utilitar de scanare"
 
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Rezoluția ultimei imagini scanate"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Lățimea imaginii scanate, în pixeli"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Direcția scanării"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Înălțimea imaginii scanate, în pixeli"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "ADEVĂRAT dacă fereastra aplicației este mărită la maximum"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -758,11 +730,28 @@ msgstr ""
 #~ "„top-to-bottom”, „bottom-to-top”, „left-to-right”, „right-to-left”"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Înălțimea imaginii scanate, în pixeli. Această valoare este actualizată la "
+#~ "cea corespunzătoare paginii scanate precedent."
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Partea de scanat a paginii. Poate fi una din următoarele: „ambele”, „față”, "
 #~ "„verso”"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Rezoluția în dpi (dots-per-inch) a imaginii scanate precedent."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Lățimea imaginii scanate, în pixeli. Această valoare este actualizată la cea "
+#~ "corespunzătoare paginii scanate precedent."
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -772,6 +761,12 @@ msgstr ""
 #~ "pentru fotografii. Aceste configurări decid rezoluția, culorile și post-"
 #~ "procesarea scanării."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Înălțimea ferestrei, în pixeli"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Lățimea ferestrei, în pixeli"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -809,3 +804,6 @@ msgstr ""
 #~ "  --sync                          Efectuează X apeluri sincrone\n"
 #~ "  --gtk-module=MODULE             Încarcă module GTK+ adiționale\n"
 #~ "  --g-fatal-warnings              Consideră toate avertismentele fatale"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Direcția scanerului față de pagina scanată."
diff --git a/po/ru.po b/po/ru.po
index 2cf47ef..bb47635 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:07+0000\n"
 "Last-Translator: Dr Gregory House <housegregory299@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "Р_азрешить"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Имя поль_зователя для ресурса:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Текст"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Фотография"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Обе стороны"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Лицевая сторона"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Обратная сторона"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Простое сканирование"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "От_сканировать"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Одна _страница"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Все страницы из _автоподатчика"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Остановить сканирование"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Текст"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Фотография"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "Отправить по _электронной почте"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Другое..."
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Справка"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Содержание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Создать новый документ"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Создать"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Отсканировать одну страницу со сканера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Отсканировать"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Сохранить"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Завершить"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Повернуть страницу влево (против часовой стрелки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Повернуть вправо"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Обрезать выбранную страницу"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Обрезать"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Имя поль_зователя для ресурса:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Пароль:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "Р_азрешить"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Параметры"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Ист_очник сканирования:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Р_азрешение текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Разрешение фотографии:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Сканируемая сторона:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Размер листа:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Яркость:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Контрастность:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Качество:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Обе стороны"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Лицевая сторона"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Обратная сторона"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Сканирование документов"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Ширина окна в пикселах"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Высота окна в пикселах"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE, если окно приложения развёрнуто на весь экран"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Устройство сканирования"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Устройство SANE для получения изображений."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Тип сканируемого документа"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,142 +311,101 @@ msgstr ""
 "Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
 "цвета и пост-обработку."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Направление сканирования"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Направление сканирования страницы."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Ширина отсканированного изображения в пикселах"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина отсканированного изображения в пикселах. Это значение обновляется при "
-"каждом новом сканировании."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Высота отсканированного изображения в пикселах"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Высота отсканированного изображения в пикселах. Это значение обновляется при "
-"каждом новом сканировании."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Ширина бумаги, см"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Высота бумаги в десятых долях мм"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Яркость изображения"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Контрастность изображения"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Разрешение последнего отсканированного изображения"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"Разрешение в точках на дюйм предыдущего отсканированного изображения."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Разрешение для сканирования текста"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Разрешение в точках на дюйм при сканировании текста."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Разрешение для сканирования фотографий"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Разрешение в точках на дюйм при сканировании фотографий."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Сторона страницы для сканирования"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Сторона страницы для сканирования."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Папка для сохранения файлов"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Папка для сохранения файлов. По умолчанию используется папка с документами."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Значение качества, используемого для сжатия JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Значение качества, используемого для сжатия JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нет доступного сканера. Подключите его."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Не могу подключиться к сканеру"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Не могу начать сканирование"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Ошибка при работе со сканером"
 
@@ -497,98 +444,110 @@ msgstr "[DEVICE...] — Устройство сканирования"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Закрыть"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Пожалуйста, проверьте, что сканер подсоединён и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Сохранить как..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Отменить"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "Со_хранить"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Все файлы"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Выберите _тип файла"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -617,16 +576,16 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "О программе"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -657,7 +616,7 @@ msgstr ""
 "  Sergey Loshakov https://launchpad.net/~sergeylo\n"
 "  Sergey Sedov https://launchpad.net/~serg-sedov\n"
 "  Stanislav Bazhenov https://launchpad.net/~stanislav-bajenov\n"
-"  Stas Solovey (stmc) https://launchpad.net/~whats-up\n"
+"  Stas Solovey https://launchpad.net/~whats-up\n"
 "  Victor Mireyev https://launchpad.net/~victor-mireyev\n"
 "  Vitaly Zawullon Katraev https://launchpad.net/~zawullon\n"
 "  evilzipik https://launchpad.net/~evilzipik\n"
@@ -665,98 +624,95 @@ msgstr ""
 "  Илья Калитко https://launchpad.net/~kalitko-ilya007"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Файлы отсутствуют"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Пожалуйста, проверьте правильность установки программы"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -785,6 +741,19 @@ msgstr "Сохранение страницы %d из %d"
 #~ "  --gtk-module=МОДУЛИ             Загрузить дополнительные модули GTK+\n"
 #~ "  --g-fatal-warnings              Сделать все предупреждения фатальными"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Высота отсканированного изображения в пикселах"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Направление сканирования"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Высота отсканированного изображения в пикселах. Это значение обновляется при "
+#~ "каждом новом сканировании."
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -792,6 +761,22 @@ msgstr "Сохранение страницы %d из %d"
 #~ "Направление сканирования. Возможны следующие варианты: 'top-to-bottom' "
 #~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE, если окно приложения развёрнуто на весь экран"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "Разрешение в точках на дюйм предыдущего отсканированного изображения."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Разрешение последнего отсканированного изображения"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Высота окна в пикселах"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Ширина окна в пикселах"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -809,11 +794,24 @@ msgstr "Сохранение страницы %d из %d"
 #~ "  --help-gtk показать ключи GTK+"
 
 #~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Ширина отсканированного изображения в пикселах. Это значение обновляется при "
+#~ "каждом новом сканировании."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Ширина отсканированного изображения в пикселах"
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
 #~ "'обратная'"
 
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Направление сканирования страницы."
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
diff --git a/po/sd.po b/po/sd.po
index 03663bc..21d72b3 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Sindhi <sd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_اجازت ڏيو"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_ڳجھو لفظ:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "تحرير"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "فوٽو"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "اڳيون ۽ پويون"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "اڳيون"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "پوئتي"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "سادو اسڪين"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_دستاويز"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "_اسڪين"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "هڪڙو _صفحو"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "اسڪين _روڪيو"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "تحرير"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "فوٽو"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_ايميل"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_صفحو"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "_کاٻي ڦيرايو"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "_ساڄي ڦيرايو"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_ڪاٽيو"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_ڪوبه نه"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_مرضي مطابق"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "کاٻي چوريو"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "ساڄي چوريو"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_مدد"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_مواد"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "نئون دستاويز بنايو"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "نئون"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "اسڪينر مان هڪڙو صفحو اسڪين ڪريو"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "اسڪين"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "سانڍيو"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "هلندڙ اسڪين روڪيو"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "روڪيو"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "کاٻي ڦيرايو"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "ساڄي ڦيرايو"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "چونڊيل صفحي کي ڪاٽيو"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "ڪاٽيو"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_ڳجھو لفظ:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_اجازت ڏيو"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "ترجيحون"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "پاسو اسڪين ڪريو:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "صفحي جي ماپ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "اڳيون ۽ پويون"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "اڳيون"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "پوئتي"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "دستاويزات اسڪين ڪريو"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "اسڪين ڪرڻ لاءِ اوزار"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "اسڪين ٿيندڙ دستاويز جو قسم"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "اسڪين جو رخ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "اسڪين ڪرڻ لاءِ صفحي جو پاسو"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "فائلون سانڍڻ لاءِ خانو"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "تمام فائلون"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "فائل جو _قسم چونڊيو"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "فائل سانڍڻ ۾ ناڪامي"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,110 +561,107 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Abdul-Rahim Nizamani https://launchpad.net/~ghaffari"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "فائلون وڃايل"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "Direction of scan"
+#~ msgstr "اسڪين جو رخ"
diff --git a/po/se.po b/po/se.po
index 911e904..f6e76a3 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-08-18 11:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Northern Sami <se@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Beassansátni:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Teaksta"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotografiija"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Ovdabealli"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Maŋos"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokumeanta"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Teaksta"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotografiija"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-boasta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Čuohpa"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Sirdde olgešguvlui"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Veahkki"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Ođđa"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Oza"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Vurke"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Bisset"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Jorat olgešguvlui"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Beassansátni:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Oidimat"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Ovdabealli"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Maŋos"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Buot fiillat"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,110 +561,104 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Christopher Forster https://launchpad.net/~christopherforster"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 6a66552..0f30309 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,284 +7,284 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Shan <shn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr ""
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
+msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
@@ -292,165 +292,117 @@ msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,108 +561,102 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index c5bfb25..8a00b34 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:07+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Schváliť"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Užívateľské meno pre zdroj:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotografia"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Jednoduché skenovanie"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Jedna stránka"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "_Všetky stránky zo zásobníka"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Zastaviť skenovanie"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotografia"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Otočiť výrez"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Vytvoriť nový dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Oskenovať jednu stránku zo skeneru"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skenovať"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Otočiť doľava"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Otočiť doprava"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Orezanie"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Užívateľské meno pre zdroj:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Heslo:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Schváliť"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Predvoľby"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Zdroj s_kenovania:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Jas:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr ""
+msgid "Quality:"
+msgstr "Kvalita:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skenovať dokumenty"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Šírka okna v pixeloch"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Výška okna v pixeloch"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Zariadenie z ktorého skenovať"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Zariadenie SANE z ktorého získať obrázky."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Druh dokumentu ktorý sa skenuje"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,140 +311,100 @@ msgstr ""
 "Typ dokumentu ktorý sa skenuje. Toto nastavenie určuje rozlíšenie, farby a "
 "spracovanie tohto skenu."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Smer skenovania"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Šírka skenovaného obrázku v pixeloch"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Šírka skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
-"skenovanej stránky."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Výška skenovaného obrázku"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Výška skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
-"skenovanej stránky."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Žiaden skener nie je k dispozícii. Prosím pripojte skener."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nie je možné pripojiť sa ku skeneru"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
@@ -499,98 +447,110 @@ msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Žiadne skenery neboli nájdené"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím skontrolujte či je skener pripojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -620,16 +580,16 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -640,98 +600,95 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Chýbajúce súbory"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Prosím skontrolujte vašu inštaláciu"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. strana z %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -739,6 +696,12 @@ msgstr "Ukladá sa %d. strana z %d"
 #~ "Smer skeneru naprieč skenovanou stránkou. Môže to byť jedno z následujúcich: "
 #~ "'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Smer skenovania"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -748,6 +711,26 @@ msgstr "Ukladá sa %d. strana z %d"
 #~ "fotografie. Táto hodnota určuje rozlíšenie skenovania, farby a koncové "
 #~ "spracovanie."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Výška okna v pixeloch"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Šírka okna v pixeloch"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Šírka skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
+#~ "skenovanej stránky."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Výška skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
+#~ "skenovanej stránky."
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -791,3 +774,9 @@ msgstr "Ukladá sa %d. strana z %d"
 #~ "  --sync Zmeniť X volania na asynchrónne\n"
 #~ "  --gtk-module=MODULY Zaviesť dodatočné GTK+ moduly\n"
 #~ "  --g-fatal-warnings Zmeniť všetky upozornenia na terminálne"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Výška skenovaného obrázku"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Šírka skenovaného obrázku v pixeloch"
diff --git a/po/sl.po b/po/sl.po
index 061dff4..0a2c447 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:19+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Pooblasti"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Uporabniško ime za vir:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Besedilo"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotografija"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Prednja in hrbtna stran"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Prednja stran"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Hrbtna stran"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Enostavno optično branje"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Op_tično branje"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Ena _stran"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Zaustavi optično branje"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Besedilo"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotografija"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Elektronska pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Velikost ZDA Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Zavrti obrezovano območje"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Premakni desno"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Vsebina"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Začni nov dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Optično branje ene strani iz optičnega bralnika"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Optično branje"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Shrani"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Zavrti levo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obrni stran v desno (smer urinega kazalca)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Zavrti desno"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Obreži izbrano stran"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Obreži"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Uporabniško ime za vir:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Geslo:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Pooblasti"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Možnosti"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Vir optičnega branja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Ločljivost besedila:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Ločljivost fotografij:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Stran optičnega branja:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Velikost strani:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Svetlost:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kakovost:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Prednja in hrbtna stran"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Prednja stran"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Hrbtna stran"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Optično preberite dokumente"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Širina okna v točkah"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Višina okna v točkah"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "PRAV, če je okno programa razpeto"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Naprava za optično branje"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Naprava SANE za pridobivanje slik."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Vrsta optično branega dokumenta"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,54 +311,22 @@ msgstr ""
 "Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
 "barve in poobdelovo."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Smer optičnega branja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Smer optičnega bralnika na optično brani strani."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Širina optično brane slike v točkah"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje optično brane strani."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Višina optično prebrane slike v točkah"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje optično prebrane strani."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Širina papirja v desetinkah milimetra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Višina papirja v desetinkah milimetra"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -378,89 +334,81 @@ msgstr ""
 "Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
 "papirja)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Svetlost optičnega branja"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Kontrast optičnega branja"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Ločljivost zadnjega optičnega branja"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Ločljivost za optično branje besedil"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Ločljivost za optično branje fotografij"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Stran strani za optično branje"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Stran strani za optično branje."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Mapa za shranjevanje datotek"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Vrednost kakovosti za stiskanje JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Vrednost kakovosti za stiskanje JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ni optičnih bralnikov na voljo. Priklopite optični bralnik."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Optičnega branja ni mogoče začeti"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Napaka med sporazumevanjem z optičnim bralnikom"
 
@@ -500,98 +448,110 @@ msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Optično bran dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Zapri"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Optičnega bralnika ni mogoče zaznati"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Shrani"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Izberite _vrsto datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Ni bilo mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -623,16 +583,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -640,101 +600,108 @@ msgstr ""
 "  Damir Jerovšek https://launchpad.net/~jierro\n"
 "  Klemen Košir https://launchpad.net/~klemen.kosir\n"
 "  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
+"  Sasa Batistic https://launchpad.net/~sasa-batistic\n"
 "  grofaty https://launchpad.net/~grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Datoteke manjkajo"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Preverite svojo namestitev"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Temenjše"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Manj"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Več"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Največ"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "PRAV, če je okno programa razpeto"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Višina okna v točkah"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Širina okna v točkah"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -757,6 +724,15 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
 #~ "'zadaj'"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Višina optično prebrane slike v točkah"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Smer optičnega branja"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Ločljivost zadnjega optičnega branja"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -766,6 +742,16 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "proti-levi'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+#~ "zadnje optično prebrane strani."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -774,6 +760,16 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "'fotografije' za fotografije. Ta nastavitev določi ločljivost optičnega "
 #~ "branja, barve in nadaljnje obdvelovanje"
 
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+#~ "zadnje optično brane strani."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Širina optično brane slike v točkah"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -801,3 +797,6 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "  --sync Uskladi klice X\n"
 #~ "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
 #~ "  --g-fatal-warnings Naredi vsa opozorila usodna"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Smer optičnega bralnika na optično brani strani."
diff --git a/po/sq.po b/po/sq.po
index bc45e8f..2a43f34 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Autorizo"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Emri i përdoruesit për resursin:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Fjalëkalim:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Tekst"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Para dhe Mbrapa"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Përball"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Mbrapa"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Skanim i thjeshtë"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokumenti"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Sk_anim"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Faqe_e_vetme"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Të Gjitha Faqet Nga _Ushqyesi"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Ndalo Skanimin"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Tekst"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "Preje"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Asnjë"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Shkronjë"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Sipas përdoruesit"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Prerje me Rrotullim"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Lëvize Majtas"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Lëvize Djathtas"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Ndihmë"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Përmbajtje"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Filloje një dokument të ri"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "I ri"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Skanoje një faqe të thjeshtë prej skanerit"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skanim"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Ruaj"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Ndaloje skanimin e tanishëm"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Ndalo"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rrotulloje faqen majtas (kundër akrepave të orës)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rrotullo faqen në të djathtë"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rrotullo Djathtas"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Preje faqen e përzgjedhur"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Prej"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Emri i përdoruesit për resursin:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Fjalëkalim:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Autorizo"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Rezolucioni i Tekstit:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Rezolucioni i Fotos:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Skanoje anën"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Përmasa e Faqes:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Ndriçimi:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Para dhe Mbrapa"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Përball"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Mbrapa"
+msgid "Quality:"
+msgstr "Cilësia:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Skanoj Dokumentet"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Gjerësia e dritares në piksel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Lartësia e dritares në piksel"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "E VËRTETË nëse dritarja e programit është maksimizuar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Paisje për te skanuar prej"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Pajisja SANE prej të cilës do merren imazhet."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Lloji i dokumentit që do të skanohet"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,144 +311,104 @@ msgstr ""
 "Tipi i dokumentit që do të skanohet. Ky parametër vendos rezolucionin e "
 "skanimit, ngjyrat dhe pas përpunimin."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Drjetim i skanimit"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Drejtimi i skanerit përmes faqes së skanuar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Gjerësia e imazhit të skanuar në pikselë"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Gjerësia e imazhit të skanuar në pikselë. Kjo vlerë përditësohet në vlerën e "
-"faqes së fundit."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Lartësia e figurës së skanuar në pixella"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Lartësia e imazhit të skanuar në pikselë. Kjo vlerë përditësohet sipas faqes "
-"së fundit të skanuar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Gjerësia e letrës në të dhjetat e mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Gjerësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Lartësia e letrës në dhjetat e një mm"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Lartësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Ndriçimi i shkëlqimit"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Rregullimi i ndriçimit nga -100 tek 100 (0 është asnjë)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Kontrasti i skanimit"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Rregullimi i kontrastit nga -100 tek 100 (0 është asnjë)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Rezulucioni i imazhit të fundit të skanuar"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Rezolucioni në pika për inç i faqes së mëparshme të skanuar."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Rezulucion per skanimet e teksteve"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohet tekst."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Rezulucion për skanimet e fotove"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohen foto."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Anë e faqes për tu skanuar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Ana e faqes që do të skanohet."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Vend për ti ruajtur gjërat"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Drejtoria ku do të ruhen skedarët. Parazgjedhja është drejtoria e "
 "dokumentëve nëse nuk zgjidhet ndonjë tjetër."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Vlera e cilësisë që do të përdoret në ngjashjen e JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nuk ka skanera të disponueshëm. Ju lutemi të lidhni një skaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Nuk jemi në gjendje të lidhim një skaner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Nuk munda të nis skanimin"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Gabim gjatë komunikimit me skanerin"
 
@@ -503,99 +451,111 @@ msgstr ""
 "Nis '%s --ndihmë' për të parë një listë të plotë të linjave të disponueshme "
 "të komandës."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Mbylle"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Nuk u dalluan skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Anullo"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Ruaje"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Zgjidh Llojin e _Skedarit"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument shumë faqësh)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Dështuam në ruajtjen e skedarit"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Nëse nuk  ruani, ndryshimet do të humbasin përgjithmonë."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Ta ruaj dokumentin e tanishëm?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Nuk jemi në gjendje ta ruajmë imazhin për parapamje"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -624,16 +584,16 @@ msgstr ""
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -642,94 +602,88 @@ msgstr ""
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolucion i lartë)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Skedarët mungojnë"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Ju lutemi të kontrolloni instalimin tuaj"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Më e Errët"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Më Pak"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Më tepër"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimum"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
@@ -756,6 +710,21 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Drjetim i skanimit"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Lartësia e figurës së skanuar në pixella"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Lartësia e dritares në piksel"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Gjerësia e dritares në piksel"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -763,3 +732,32 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ msgstr ""
 #~ "Përdorimi:\n"
 #~ "  %s [DEVICE...] - Mjeti skanues"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "E VËRTETË nëse dritarja e programit është maksimizuar"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Rezulucioni i imazhit të fundit të skanuar"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Drejtimi i skanerit përmes faqes së skanuar."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Gjerësia e imazhit të skanuar në pikselë. Kjo vlerë përditësohet në vlerën e "
+#~ "faqes së fundit."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Lartësia e imazhit të skanuar në pikselë. Kjo vlerë përditësohet sipas faqes "
+#~ "së fundit të skanuar."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Rezolucioni në pika për inç i faqes së mëparshme të skanuar."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Gjerësia e imazhit të skanuar në pikselë"
diff --git a/po/sr.po b/po/sr.po
index d01c8e7..0622431 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,321 +1,309 @@
 # Serbian translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
-"PO-Revision-Date: 2012-10-30 08:48+0000\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"PO-Revision-Date: 2014-02-28 14:28+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: sr\n"
 
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Овласти"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Корисничко име за извор:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Лозинка:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Текст"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Слика"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Лице и позадина"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Лице"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Позадина"
+
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Обично скенирање"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Документ"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "С_кенирај"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Једну _страницу"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Све странице из _фиоке"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Заустави скенирање"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Текст"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Слика"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Ел. пошта"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Окрени на _лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Окрени на _десно"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Опсеци"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "А_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "А_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "А_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Америчко писмо"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "_Легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "_Ротирај опсечено"
+msgstr "_Заокрени опсечено"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr "Помери лево"
+msgstr "Помери улево"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr "Помери десно"
+msgstr "Помери удесно"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "По_моћ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Садржај"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Покрените нови документ"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
-msgstr "Нова"
+msgstr "Ново"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Скенирајте једну страницу са скенера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Скенирај"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Сачувај"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Зауставите текуће скенирање"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Заустави"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Окрените страну на лево (супротно смеру казаљке на сату)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Окрени на лево"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Окрените страну на десно (у смеру казаљке на сату)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Окрени на десно"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Одрежите изабрану страну"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Одрежи"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Корисничко име за извор:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Лозинка:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "О_власти"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
-msgstr "Подешавања"
+msgstr "Поставке"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Извор _скенирања:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Резолуција _текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Ре_золуција слике:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Странице за скенирање:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Величина странице:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Освјетљај:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Контраст:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Наличје и позадина"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Наличје"
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Позадина"
+msgid "Quality:"
+msgstr "Квалитет:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Скенирајте документе"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Ширина прозора у тачкама"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Висина прозора у тачкама"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "ТАЧНО ако је прозор програма увећан"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
-msgstr "Уређај из ког ће се скенирати"
+msgstr "Уређај са ког ће се скенирати"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
-msgstr "САНЕ уређај из ког ће се унети слике."
+msgstr "САНЕ уређај са ког ће се унети слике."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Врста документа који ће бити скениран"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,150 +311,110 @@ msgstr ""
 "Врста документа који ће бити скениран. Ово подешавање одлучује о резолуцији, "
 "бојама и завршној обради скенирања."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Правац скенирања"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Усмерење скенера преко скениране странице."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Ширина скениране слике у тачкама"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
-"величину последње скениране странице."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Висина скениране слике у тачкама"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Висина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
-"величину последње скениране странице."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Ширина папира у десетом делу милиметра"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Ширина папира у десетом делу милиметра (или 0 за аутоматско откривање "
+"Ширина папира у десетом делу милиметра (или 0 за самостално откривање "
 "папира)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Висина папира у десетом делу милиметра"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Висина папира у десетом делу милиметра (или 0 за аутоматско откривање "
+"Висина папира у десетом делу милиметра (или 0 за самостално откривање "
 "папира)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Осветљај скенирања"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Дотеривање осветљаја од -100 до 100 (0 значи ништа)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Контраст скенирања"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Резолуција последње скениране слике"
+msgstr "Дотеривање контраста од -100 до 100 (0 значи ништа)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Резолуција за скенирања текста"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Резолуција у тачкама-по-инчу (dpi) која ће бити коришћена при скенирању "
 "текста."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Резолуција за скенирања слика"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "Резолуција у тачкама-по-инчу (dpi) која ће бити коришћена при скенирању "
 "фотографија."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Страна странице за скенирање"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Страна странице за скенирање."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Директоријум за чување датотека"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Директоријум у коме ће бити сачуване датотеке. Ако није постављено онда је "
 "то основни директоријум докумената."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Вредност квалитета за ЈПЕГ сажимање"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Вредност квалитета која ће се користити за ЈПЕГ сажимање."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нема доступних скенера. Молим прикључите скенер."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Не могу да се повежем са скенером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Не могу да започнем скенирање"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Грешка у коминикацији са скенером"
 
@@ -507,98 +455,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Покрените „%s --help“ за потпуни списак свих опција из командне линије."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Затвори"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Нема откривених скенера"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Сачувај као..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Откажи"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Сачувај"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Све датотеке"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
-msgstr "_Изаберите врсту датотеке"
+msgstr "_Изабери врсту датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (сажето)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Нисам успео да сачувам датотеку"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Уколико не сачувате, измене ће бити трајно изгубљене."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Да сачувам текући документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Не могу да сачувам слику за преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Не могу да отворим програм за приказивање слика"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -614,7 +574,7 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "Овај програм је слободан софтвер: можете га делити и/или\n"
-"мењати под условима ГНУ-ове Опште јавне лиценце коју је\n"
+"мењати под условима Гнуове Опште јавне лиценце коју је\n"
 "објавила Задужбина слободног софтвера, било верзије 3\n"
 "лиценце, или (по вашем избору) било које новије верзије.\n"
 "\n"
@@ -628,16 +588,16 @@ msgstr ""
 "http://www.gnu.org/licenses/."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "О Једноставном скенирању"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,97 +609,121 @@ msgstr ""
 "  Мирослав Николић https://launchpad.net/~lipek"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d тпи (висока резолуција)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d тпи"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Недостају датотеке"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Проверите вашу инсталацију"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Тамније"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
-msgstr ""
+msgstr "Светлије"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
-msgstr ""
+msgstr "Мање"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
-msgstr ""
+msgstr "Више"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
-msgstr ""
+msgstr "Најмање"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
-msgstr ""
+msgstr "Највише"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr "Чувам страницу %d од укупно %d странице"
+msgstr "Чувам %d. страницу од укупно %d"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Правац скенирања"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Резолуција последње скениране слике"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Висина скениране слике у тачкама"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "ТАЧНО ако је прозор програма увећан"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Усмерење скенера преко скениране странице."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Ширина скениране слике у тачкама"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Висина прозора у тачкама"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Ширина прозора у тачкама"
 
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
@@ -809,3 +793,17 @@ msgstr "Чувам страницу %d од укупно %d странице"
 #~ "  --sync                          Усаглашава позиве Икса\n"
 #~ "  --gtk-module=MODULES            Учитава допунске Гтк+ модуле\n"
 #~ "  --g-fatal-warnings              Чини сва упозорења кобним"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Ширина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
+#~ "величину последње скениране странице."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Висина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
+#~ "величину последње скениране странице."
diff --git a/po/sv.po b/po/sv.po
index ae4f4de..bda74a5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "A_uktorisera"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Användarnamn för källa:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Foto"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Fram- och baksida"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Framsida"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Baksida"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Enkel bildinläsning"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "Läs _in"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Enkel _sida"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Alla sidor från _matare"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Stoppa inläsning"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Text"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Foto"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Sida"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Rotera beskär"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Innehåll"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Starta ett nytt dokument"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Nytt"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Läs in en enstaka sida från bildläsaren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Läs in"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Spara"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Stoppa den aktuella bildinläsningen"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Stoppa"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotera sidan åt vänster (motsols)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotera sidan åt höger (medsols)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Beskär den valda sidan"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Beskär"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Användarnamn för källa:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Lösenord:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "A_uktorisera"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Inläsnings_källa:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Textupplösning:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Fotoupplösning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Inläsningssida:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sidstorlek:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Ljusstyrka:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Fram- och baksida"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Framsida"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Baksida"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Läs in dokument"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Fönsterbredd i bildpunkter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Fönsterhöjd i bildpunkter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE om programfönstret är maximerat"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Enhet att läsa in från"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhet att hämta in bilder från."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Typ av dokument som ska läsas in"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Typ av dokument att läsa in. Denna inställning bestämmer inläsningens "
 "upplösning, färger och efterbehandling."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Riktning för inläsning"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Riktningen för bildläsaren över den inlästa sidan."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Bredd för den inlästa bilden i bildpunkter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
-"som senaste inlästa bilden använde."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Höjd för den inlästa bilden i bildpunkter"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
-"som senaste inlästa bilden använde."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Bredd på pappret i tiondels millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
 "pappersidentifiering)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Höjd på pappret i tiondels millimeter"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,90 +335,82 @@ msgstr ""
 "Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
 "pappersidentifiering)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Ljusstyrka i skanningen"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Instöllningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Kontrasten på skanningen"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Upplösning för senaste inlästa bild"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Upplösningen i punkter per tum för den föregående inlästa bilden."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Upplösning för textinläsningar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Upplösning i punkter per tum att använda när text läses in."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Upplösning för fotoinläsningar"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Upplösningen i punkter per tum att använda när foton läses in."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Sida att läsa in"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Papprets sida att läsa in."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Katalog att spara filer i"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
 "är inställd."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Inga bildläsare finns tillgängliga. Anslut en bildläsare."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Kan inte ansluta till bildläsare"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Kan inte starta inläsning"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Fel i kommunikation med bildläsare"
 
@@ -503,98 +451,110 @@ msgstr ""
 "Kör \"%s --help\" för en komplett lista över tillgängliga "
 "kommandoradsflaggor."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Spara som..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Alla filer"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Välj fil_typ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Kunde inte spara bild för förhandsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -624,16 +584,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -649,98 +609,98 @@ msgstr ""
 "  Zahirovic Mensur https://launchpad.net/~nookienoq"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Filer saknas"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Kontrollera din installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Mörkare"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "Riktning för inläsning"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -749,6 +709,24 @@ msgstr "Sparar sida %d av %d"
 #~ "Användning:\n"
 #~ "  %s [ENHET...] - Inläsningsverktyg"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Höjd för den inlästa bilden i bildpunkter"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Upplösning för senaste inlästa bild"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Bredd för den inlästa bilden i bildpunkter"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "Fönsterhöjd i bildpunkter"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Fönsterbredd i bildpunkter"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE om programfönstret är maximerat"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -788,6 +766,13 @@ msgstr "Sparar sida %d av %d"
 #~ "  --g-fatal-warnings              Gör alla varningar ödesdigra"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
+#~ "som senaste inlästa bilden använde."
+
+#~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 #~ msgstr ""
@@ -795,6 +780,16 @@ msgstr "Sparar sida %d av %d"
 #~ "följande: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
 #~ "left\""
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "Upplösningen i punkter per tum för den föregående inlästa bilden."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
+#~ "som senaste inlästa bilden använde."
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -808,3 +803,6 @@ msgstr "Sparar sida %d av %d"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back\""
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Riktningen för bildläsaren över den inlästa sidan."
diff --git a/po/te.po b/po/te.po
index da0740c..eb39ab9 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,357 +7,313 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "అధికారమిచ్చు(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "వనరుకు వాడుకరిపేరు(_U):"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "సంకేతపదం(_P):"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "పాఠ్యం"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "ఫొటో"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "ముందు మరియు వెనుక"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "ముందుభాగం"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "వెనుకకు"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "సింపుల్ స్కాన్"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "పత్రం (_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "స్కాన్(_a)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "ఒక పేజీ(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "స్కాన్ ఆపు(_S)"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "పాఠ్యం"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "ఫొటో"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "ఈమెయిల్(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "పేజీ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "ఎడమవైపు తిప్పు (_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "కుడివైపు తిప్పు(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "క్రాప్ చేయి(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "ఏదీకాదు(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "లెటర్ (_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "లీగల్ (_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "మలచుకొను(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "ఎడమకు జరుపు"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "కుడి వైపు జరుపు"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "విషయసూచిక(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "ఒక కొత్త పత్రాన్ని ప్రాంరంభించు"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "కొత్త"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "స్కానర్ నుండి ఒకే ఒక పేజీ స్కాన్ చేయి"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "స్కాన్"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "భద్రపరచు"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "ప్రస్తుత స్కాన్ ఆపు"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "ఆపు"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ఎడమవైపుకు త్రిప్పు (అపసవ్య)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "ఎడమవైపు తిప్పు"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "కుడి వైపుకు త్రిప్పు (సవ్య)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "కుడివైపు తిప్పు"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "ఎంపికైన పెజీ అంచులుసవరించు"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "అంచులుసవరించు"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "వనరుకు వాడుకరిపేరు(_U):"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "సంకేతపదం(_P):"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "అధికారమిచ్చు(_A)"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "పాఠ విభాజకత (_T)"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "ఫొటో విభాజకత(_P)"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "స్కాన్ చేయు ప్రక్క:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "పేజీ పరిమాణం:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "ముందు మరియు వెనుక"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "ముందుభాగం"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "వెనుకకు"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "పత్రాలు స్కాన్ చేయు"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "విండో వెడల్పు పిక్సెళ్ళలో"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "విండో ఎత్తు పిక్సెళ్ళలో"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE అనువర్తనం విండో గరిష్ఠ పరిమాణంలో చూపబడుతున్నట్లైతే"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "స్కాన్ చేయుటకు పరికరం"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "బొమ్మలు తెచ్చుకొనుటకు SANE పరికరం."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "స్కాన్ చేయబడుచున్న పత్ర రకం"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "స్కాన్‌చేయు దిశ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "స్కాన్‌చేయబడిన బొమ్మ వెడల్పు(పిక్సెళ్ళలో)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"స్కాన్ చేయబడిన బొమ్మ  వెడల్పు పిక్సెళ్ళలో. ఇటీవలి స్కాన్‌చేసిన పేజీ అధారంగా "
-"ఈ సంఖ్యమార్చబడుతుంది."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "స్కాన్‌చేయబడిన బొమ్మ ఎత్తు(పిక్సెళ్ళలో)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"స్కాన్ చేయబడిన బొమ్మ  ఎత్తు పిక్సెళ్ళలో. ఇటీవలి స్కాన్‌చేసిన పేజీ అధారంగా ఈ "
-"విలువ మార్చబడుతుంది."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "పేపర్ వెడల్పు (మిమీ లో దశాంశభాగం)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -365,11 +321,11 @@ msgstr ""
 "పేపర్ వెడల్పు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
 "కనుగొనటానికి)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "పేపర్ ఎత్తు (మిమీలో దశాంశభాగం)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -377,90 +333,82 @@ msgstr ""
 "పేపర్ పొడవు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
 "కనుగొనటానికి)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "ఇటీవలి స్కాన్‌చేయబడిన బొమ్మ విభాజకత"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "ఇటీవల స్కాన్ చేయబడిన బొమ్మ విభాజకత (అంగుళానికి చుక్కలు)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "పాఠ్య స్కాన్‌లకు విభాజకత"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "పాఠం స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "ఫొటో స్కాన్‌లకు విభాజకత"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "ఫొటోలు స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "ఏ వైపునుంచి పేజీని స్కాన్‌చేయాలి"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "పేజీని స్కాన్ చేయవలసిన భాగం."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ఫైళ్లు దాచవలసిన సంచయం"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "ఫైళ్లు దాచవలసిన సంచయం. గమ్యస్థానం ఇవ్వనట్లైతే పత్రాల (Documents) అప్రమేయ "
 "సంచయం వాడబడుతుంది."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "ఏ స్కానర్‌లు అందుబాటులోలేవు. దయచేసి ఒక స్కానర్‌ను అనుసంధానించండి."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "స్కానర్‌కు అనుసంధానించలేకపోతోంది"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "స్కాన్ ప్రారంభించుట వీలుకాలేదు"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "స్కానర్‌తో వర్తమాన దోషం"
 
@@ -499,99 +447,111 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "ఫైల్ రకం ఎంచుకోండి( _T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "ఫైల్ దాచుటలో విఫలమైంది"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ఒకవేళ మీరు దాచకపోతే, మార్పులను శాశ్వతముగా కోల్పోతారు."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -619,16 +579,16 @@ msgstr ""
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -638,102 +598,102 @@ msgstr ""
 "  వీవెన్ (Veeven) https://launchpad.net/~veeven"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ఉన్నత విభాజకత)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "కనబడని ఫైళ్లు"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "దయచేసి మీ స్థాపనని సరిచూసుకోండి"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE అనువర్తనం విండో గరిష్ఠ పరిమాణంలో చూపబడుతున్నట్లైతే"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "స్కాన్ చేయుటకు పేజీ భాగం. రెండువైపుల పైన, వెనుక,"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "ఇటీవల స్కాన్ చేయబడిన బొమ్మ విభాజకత (అంగుళానికి చుక్కలు)"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -749,6 +709,38 @@ msgstr ""
 #~ "స్కాన్ చేయబడుచున్న పత్ర రకం  'పాఠం' పాఠ్యపత్రములకు, 'ఫోటో' ఫొటోలకొరకు.  ఈ "
 #~ "అమరిక స్కాన్ విభాజకత, రంగులు మరియు స్కాన్ చేసినతరువాత పనులు నిర్ణయించును"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "స్కాన్‌చేయబడిన బొమ్మ ఎత్తు(పిక్సెళ్ళలో)"
+
+#~ msgid "Direction of scan"
+#~ msgstr "స్కాన్‌చేయు దిశ"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "ఇటీవలి స్కాన్‌చేయబడిన బొమ్మ విభాజకత"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "స్కాన్ చేయబడిన బొమ్మ  ఎత్తు పిక్సెళ్ళలో. ఇటీవలి స్కాన్‌చేసిన పేజీ అధారంగా ఈ "
+#~ "విలువ మార్చబడుతుంది."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "విండో ఎత్తు పిక్సెళ్ళలో"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "విండో వెడల్పు పిక్సెళ్ళలో"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "స్కాన్ చేయబడిన బొమ్మ  వెడల్పు పిక్సెళ్ళలో. ఇటీవలి స్కాన్‌చేసిన పేజీ అధారంగా "
+#~ "ఈ సంఖ్యమార్చబడుతుంది."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "స్కాన్‌చేయబడిన బొమ్మ వెడల్పు(పిక్సెళ్ళలో)"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -794,3 +786,6 @@ msgstr ""
 #~ "  --sync                          Make X calls synchronous\n"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
diff --git a/po/th.po b/po/th.po
index f4e8c1c..4a977b2 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_อนุญาต"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_ชื่อผู้ใช้ทรัพยากร :"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "รหัส_ผ่าน:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "ข้อความ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "ภาพถ่าย"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "หน้าและหลัง"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "หน้า"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "หลัง"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "เ_อกสาร"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "สแกน"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_หน้าเดี่ยว"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_หยุดสแกน:"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "ข้อความ"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "ภาพถ่าย"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_อีเมล"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_หน้า"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "หมุน_ซ้าย"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "หมุน_ขวา"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_ตัด"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "ไ_ม่มี"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_จดหมาย"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_กำหนดเอง"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "หมุ_นภาพตัด"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "ย้ายไปทางซ้าย"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "ย้ายไปทางขวา"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_วิธีใช้"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "เ_นื้อหา"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "เริ่มเอกสารใหม่"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "สร้าง"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "สแกน"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "บันทึก"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "หยุดการสแกนขณะนี้"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "หยุด"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "หมุนซ้าย"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "หมุนขวา"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "ตัดหน้าที่เลือก"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "ตัด"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_ชื่อผู้ใช้ทรัพยากร :"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "รหัส_ผ่าน:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_อนุญาต"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "แ_หล่งสแกน:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "ความละเอียด_ข้อความ:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "ความละเอียด_ภาพถ่าย:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "สแกนด้าน:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "ขนาดกระดาษ :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "หน้าและหลัง"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "หน้า"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "หลัง"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "สแกนเอกสาร"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "ความกว้างของหน้าต่างเป็นพิกเซล"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "ความสูงของหน้าต่างเป็นพิกเซล"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "เป็นจริง ถ้าหน้าต่างโปรแกรมขนายเต็มหน้าจอ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "เครื่องสแกนจาก"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "อุปกรณ์ SANE เพื่อรับภาพจาก"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "ชนิดของเอกสารที่ถูกสแกน"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,141 +311,103 @@ msgstr ""
 "ชนิดของเอกสารที่จะสแกน การตั้งค่านี้มีผลต่อความละเอียดการสแกน สี "
 "และการประมวลผลหลังสแกน"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "ทิศทางของการสแกน"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "ทิศทางของสแกนเนอร์ตอนสแกนผ่านหน้ากระดาษ"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "ความกว้างของภาพที่ สแกนเป็นพิกเซล"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"ความกว้างของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "ความสูงของภาพที่สแกน เป็นพิกเซล"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"ความสูงของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "ความกว้างของกระดาษใน 10 ของมิลลิเมตร"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "ความกว้างของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "ความสูงของกระดาษใน 10 ของมิลลิเมตร"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "ความสูงของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "ความละเอียดของภาพที่สแกนล่าสุด"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "ความละเอียด เป็นจุดต่อ นิ้วของภาพที่สแกนก่อนหน้านี้"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "ความละเอียดการสแกนข้อความ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนข้อความ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "ความละเอียดการสแกนภาพถ่าย"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนภาพ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "หน้ากระดาษ ด้านที่จะสแกน"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "ด้านกระดาษที่จะสแกน"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ไดเรคทอรีเพื่อบันทึกไฟล์"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "ไดเรกทอรีที่ใช้บันทึกแฟ้ม ค่าเริ่มต้นไดเรกทอรีสำหรับเอกสารถ้าไม่มีการตั้งค่า"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "ไม่สามารถเริ่มต้นการสแกน"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "การสื่อสารกับเครื่องสแกนผิดพลาด"
 
@@ -496,98 +446,110 @@ msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "เลือก_ประเภทแฟ้ม"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "การบันทึกแฟ้มล้มเหลว"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ถ้าคุณไม่บันทึกการแก้ไขทั้งหมดจะสูญหายอย่างถาวร"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -616,16 +578,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -637,98 +599,107 @@ msgstr ""
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ความละเอียดสูง)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "ไม่พบแฟ้ม"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "กรุณาตรวจสอบการติดตั้งของคุณ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "ทิศทางของการสแกน"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "ความสูงของภาพที่สแกน เป็นพิกเซล"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "ความละเอียดของภาพที่สแกนล่าสุด"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "เป็นจริง ถ้าหน้าต่างโปรแกรมขนายเต็มหน้าจอ"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -737,9 +708,24 @@ msgstr ""
 #~ "'ซ้าย-ไป-ขวา' 'ขวา-ไป-ซ้าย'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "ความสูงของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
+
+#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "สแกนหน้ากระดาษ สามารถสแกนได้จากนี้ :'ทั้งคู่' 'หน้า' 'หลัง'"
 
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "ความละเอียด เป็นจุดต่อ นิ้วของภาพที่สแกนก่อนหน้านี้"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "ความกว้างของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -748,6 +734,15 @@ msgstr ""
 #~ "ชนิดของเอกสารที่ถูกสแกน 'ข้อความ'สำหรับเอกสารข้อความ'รูปภาพ'สำหรับภาพถ่าย "
 #~ "การตั้งค่านี้ตัดสินใจในการสแกนความละเอียดของสีและหลังการประมวลผล"
 
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "ความกว้างของภาพที่ สแกนเป็นพิกเซล"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "ความสูงของหน้าต่างเป็นพิกเซล"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "ความกว้างของหน้าต่างเป็นพิกเซล"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -795,3 +790,6 @@ msgstr ""
 #~ "  --gtk-module=MODULES            โหลดมอดูล GTK+ เพิ่มเติม\n"
 #~ "  --g-fatal-warnings              ถือว่าคำเตือนต่างๆ "
 #~ "ที่เกิดขึ้นเป็นความผิดพลาดร้ายแรง"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "ทิศทางของสแกนเนอร์ตอนสแกนผ่านหน้ากระดาษ"
diff --git a/po/tr.po b/po/tr.po
index a13f66f..15d34d8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Yetkilendir"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "Kaynak için _kullanıcı adı:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Parola:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Metin"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Fotoğraf"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Ön ve Arka taraf"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Ön taraf"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Arka taraf"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Basit Tarama"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Belge"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "T_ara"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "_Tek Sayfa"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Kaynaktaki Tüm _Sayfalar"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "_Taramayı Durdur"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Metin"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Fotoğraf"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Eposta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Sa_ğa Çevir"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Kırpmayı Döndür"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Yardım"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_İçindekiler"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Yeni bir belge başlat"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Yeni"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Tarayıcıdan tek bir sayfa tara"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Tara"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Kaydet"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Durdur"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Sayfayı sola döndür (saat yönünün tersine)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Sola Döndür"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Sayfayı sağa döndür (saat yönünde)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Sağa Döndür"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Seçili sayfayı kırp"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Kırp"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "Kaynak için _kullanıcı adı:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Parola:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Yetkilendir"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Tercihler"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Ta_rama Kaynağı:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "_Metin Çözünürlüğü:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "_Fotoğraf Çözünürlüğü:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Taranacak taraf:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Sayfa Boyutu:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Parlaklık:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Karşıtlık:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Kalite:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Ön ve Arka taraf"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Ön taraf"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Arka taraf"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Belgeleri Tara"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Pencerenin piksel cinsinden genişliği"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Pencerenin piksel cinsinden yüksekliği"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Uygulama penceresi ekranı kapladığında DOĞRU (TRUE)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Tarama yapılacak aygıt"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Görüntülerin alınacağı SANE aygıtı"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Taranacak belgenin türü"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,43 +311,11 @@ msgstr ""
 "Taranacak belge türü. Bu ayar tarama kalitesi, renkler ve son işlemlere göre "
 "belirlenir."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Tarama yönü"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Tarayıcının taranmış sayfa boyunca yönü."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Taranan görüntünün piksel cinsinden genişliği"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Taranan görüntünün piksel cinsinden genişliği. Bu değer en son taranan "
-"sayfaya göre güncellenir."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Taranan görüntünün piksel cinsinden yüksekliği. Bu değer en son taranan "
-"sayfaya göre güncellenir."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -367,11 +323,11 @@ msgstr ""
 "Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
 "için 0)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -379,94 +335,85 @@ msgstr ""
 "Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
 "için 0)."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Tarama parlaklığı"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "-100'den 100'e (0 hiçbiri) parlaklık ayarlaması"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Tarama karşıtlığı"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "-100'den 100'e (0 hiçbiri) karşıtlık ayarlaması"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "En son taranan görüntünün çözünürlüğü"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden çözünürlüğü."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Metin taramaları için çözünürlük"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Metin tararken kullanılacak inç başına nokta sayısı cinsinden çözünürlük."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Fotoğraf taramaları için çözünürlük"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 "Fotoğrafları tararken kullanılacak inç başına nokta sayısı cinsinden "
 "çözünürlük."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Taranacak sayfa tarafı"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Taranacak sayfa yüzü."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Dosyaların kaydedileceği dizin"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
 "varsayılandır."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "JPEG sıkıştırması için kalite değeri"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG sıkıştırması için kalite değeri"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Mevcut hiçbir tarayıcı yok. Lütfen bir tarayıcı bağlayın."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Tarayıcıya bağlanılamadı"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Tarama başlatılamadı"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Tarayıcı ile iletişim kurulamıyor"
 
@@ -507,98 +454,110 @@ msgstr ""
 "Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
 "help' komutunu çalıştırın."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "_Kapat"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Vazgeç"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "_Kaydet"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Dosya _Türünü Seç"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Görüntü, önizleme için kaydedilemiyor"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -627,16 +586,16 @@ msgstr ""
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -661,98 +620,95 @@ msgstr ""
 "  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Dosyalar eksik"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Lütfen kurulumunuzu denetleyiniz"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "Daha Az"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "En Az"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "En Çok"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -783,6 +739,15 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ " --gtk-module=MODULLER          Tüm ek GTK+ modullerini yükler\n"
 #~ "  --g-fatal-warnings              Tüm uyarıları ölümcül yapar"
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Pencerenin piksel cinsinden yüksekliği"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Taranan görüntünün piksel cinsinden genişliği"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Pencerenin piksel cinsinden genişliği"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -799,6 +764,12 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "  -help-all Tüm yardım seçeneklerini göster\n"
 #~ "  --help-gtk GTK+ seçeneklerini göster"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Tarama yönü"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -807,6 +778,27 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ "aşağıya' 'aşağıdan yukarıya' 'soldan sağa' 'sağdan sola'"
 
 #~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Taranan görüntünün piksel cinsinden yüksekliği. Bu değer en son taranan "
+#~ "sayfaya göre güncellenir."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden çözünürlüğü."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "En son taranan görüntünün çözünürlüğü"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Taranan görüntünün piksel cinsinden genişliği. Bu değer en son taranan "
+#~ "sayfaya göre güncellenir."
+
+#~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
@@ -820,3 +812,9 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ msgstr ""
 #~ "Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' 'ön "
 #~ "taraf' 'arka taraf'"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Uygulama penceresi ekranı kapladığında DOĞRU (TRUE)"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Tarayıcının taranmış sayfa boyunca yönü."
diff --git a/po/ug.po b/po/ug.po
index 5e664e6..6b291f8 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-08-07 01:17+0000\n"
 "Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
@@ -15,310 +15,298 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "دەلىللە(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "مەنبەنىڭ ئىشلەتكۈچى ئاتى(_U):"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "ئىم(_P):"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "تېكست"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "سۈرەت"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "ئالدى كەينى"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "ئالدى"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "قايتىش"
+
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "پۈتۈك(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "تەسۋىر ياي(_A)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "بىر تاللام بەت(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "كىرگۈزگۈچتىن ھەممە بەتلەر(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "تەسۋىر يېيىشنى توختات(_S)"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "تېكست"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "سۈرەت"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "ئېلخەت(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "بەت(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "قىرقىش(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "يوق(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "لىپاپ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "US Legal(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "ئىختىيارى(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "كېسىش دائىرىسىنى ئايلاندۇر(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "ئوڭغا يۆتكە"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "مەزمۇنلار(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "يېڭى بىر پۈتۈك قۇرىدۇ"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "يېڭى"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "شولالىغۇچتىن بىر بەتنىلا تەسۋىر يايىدۇ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "تەسۋىر ياي"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلا"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "ساقلا"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "نۆۋەتتىكى تەسۋىر يېييشنى توختات"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "توختا"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "بەتنى سولغا ئايلاندۇر (سائەت يۆلىنىشىگە قارشى)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "سولغا چۆرگىلىتىش"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "بەتنى ئوڭغا ئايلاندۇر (سائەت يۆلىنىشىدە)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "ئوڭغا چۆرگىلىتىش"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "تاللانغان بەتنى كەس"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "كەس"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "مەنبەنىڭ ئىشلەتكۈچى ئاتى(_U):"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "ئىم(_P):"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "دەلىللە(_A)"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "تەسۋىر يېيىش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "تېكست ئېنىقلىقى(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "–فوتو ئېنىقلىقى(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "ﺋﯩﺰﺩﯨﻠﺪﯨﻐﺎﻥ ﺑﻪﺕ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "قەغەز چوڭلۇقى:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "يورۇقلۇق:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "سېلىشتۇرما دەرىجە:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "سۈپەت:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "ئالدى كەينى"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "ئالدى"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "قايتىش"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "پۈتۈك شولىلاش"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "كۆزنەك كەڭلىكى (پىكسېل)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "كۆزنەك ئېگىزلىكى (پىكسېل)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE ئەپ كۆزنەك چوڭايتىلغان بولسا"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "تەسۋىر يېيىش ئۈسكۈنىسى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "SANE ئۈسكۈنىدىن سۈرەتكە ئېرىشىدۇ."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "تەسۋىر يايىدىغان پۈتۈكنىڭ تىپى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -326,43 +314,11 @@ msgstr ""
 "ھۆججەت تېپى تەكشۈرىلىۋاتىدۇ، بۇ تەڭشەك بولسا ئېنىقلىق دەرىجىسى، رەڭگى ۋە "
 "كىيىنكى بىرتەرەپ قىلىشنى بېكىتىدۇ."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "تەسۋىر يېيىش يۆنىلىشى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "تەسۋىر ئالغۇچ تەسۋىرگە ئېلىنىپ بولغان بەتتىن ئۆتىدۇ."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "تەسۋىر يايىدىغان سۈرەتنىڭ كەڭلىكى (پىكسېل)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"تەسۋىر يايىدىغان سۈرەتنىڭ كەڭلىكى (پىكسېل). بۇ ئاخىرقى قېتىملىق تەسۋىر "
-"يايغان بەتنىڭ قىممىتى."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "تەسۋىر يايغان سۈرەتنىڭ ئېگىزلىكى (پىكسېل)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"تەسۋىر يايغان سۈرەتنىڭ ئېگىزلىكى (پىكسېل). بۇ ئاخىرقى قېتىم تەسۋىر يايغان "
-"بەتنىڭ قىممىتى."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -370,11 +326,11 @@ msgstr ""
 "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
 "ئۈچۈن 0 )"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "ﻗﻪﻏﻪﺯ ﺋﯩﮕﯩﺰﻟﯩﻜﻰ (mm 0.1 ﺋﯧﻨﯩﻘﻠﯩﻘﯩﺪﺍ)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -382,90 +338,82 @@ msgstr ""
 "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق ئېگىزلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
 "ئۈچۈن 0 )"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "شويلىلاش يورۇقلۇقى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى (چېكىت ھەر دىيۇيم)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "تېكىست تەسۋىر يېيىشنىڭ ئېنىقلىقى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "DPI (چېكىت ھەر دىيۇم) تېكستلارغا ئىشلىتىدىغان قىممەت"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "سۈرەت تەسۋىر يېيىشنىڭ ئېنىقلىقى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "DPI (چېكىت ھەر دىيۇم) رەسىملەرگە ئىشلىتىدىغان قىممەت"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "شولالايدىغان بەت يۈزى"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "بەت گىرۋىكىنى تەسۋىرگە ئېلىش."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "ﺋﺎﺭﺧﯩﭙﻼﺭ ﺳﺎﻗﻠﯩﻨﺪﯨﻐﺎﻥ ﻣﯘﻧﺪﻩﺭﯨﺠﻪ"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "ھۆججەتلەرنى ساقلايدىغان مۇندەرىجە. ئەگەر تەڭشەلمىگەن بولسا كۆڭۈلدىكى "
 "ئەھۋالدا پۈتۈكلىرىمگە ساقلايدۇ."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "شولالىغۇچ يوق، ئۇنى چېكىڭ."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "شولالىغۇچ بىلەن باغلىنالمىدى"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "تەسۋىر يېيىشنى باشلىيالمىدى"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "شۇلالىغۇچ بىلەن ئالاقە قىلىۋاتقاندا خاتالىق كۆرۈلدى"
 
@@ -507,98 +455,110 @@ msgstr ""
 "«%s --help» كىرگۈزسىڭىز بۇيرۇق قۇرىدا ئىشلەتكىلى بولىدىغان بارلىق "
 "تاللانمىلارنى كۆرەلەيسىز."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "سكەنلىگەن ھۆججەت.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "«%s» نى زىيارەت قىلىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم كېرەك"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "شولالىغۇچ بايقالمىدى"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "شولالىغۇچنى چېتىپ توك مەنبەسىنى ئېچىڭ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "سۈرەت ھۆججەتلەر"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "ھەممە ھۆججەتلەر"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "ھۆججەت شەكلىنى تاللا(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (پىرىسلانغان)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "ھۆججەتنى ساقلىيالمىدى"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ساقلانمىسا، ئۆزگەرتىشلەرنىڭ ھەممىسى مەڭگۈلۈككە يوقىلىدۇ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "كۆرۈنمە رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆزىتىدىغان ئەپنى ئاچالمىدى"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -629,16 +589,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Simple Scan ھەققىدە"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "ئاددى بولغان پۈتۈك تەسۋىر يېيىش قورالى"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -652,98 +612,95 @@ msgstr ""
 "  umar tumur https://launchpad.net/~umar-tumur"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "ھۆججەت تېپىلمىدى"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "ئورنىتىشىڭىزنى تەكشۈرۈپ بېقىڭ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "شولالىغۇچ ئالماشتۇر(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "تۆۋەن"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -804,3 +761,44 @@ msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 #~ "--sync X- ماس قەدەملەشتۈرۈشنى قوزغىتىشنى ئىجرا قىلىش\n"
 #~ "--gtk-module باشقا بىر GTK+ Module نى قوزغىتىش\n"
 #~ "--g-fatal-warnigs ھەممە ئاگاھلاندۇرۇشلار خەتەرگە ئايلىندۇ"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "تەسۋىر ئالغۇچ تەسۋىرگە ئېلىنىپ بولغان بەتتىن ئۆتىدۇ."
+
+#~ msgid "Window height in pixels"
+#~ msgstr "كۆزنەك ئېگىزلىكى (پىكسېل)"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "كۆزنەك كەڭلىكى (پىكسېل)"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE ئەپ كۆزنەك چوڭايتىلغان بولسا"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "تەسۋىر يايىدىغان سۈرەتنىڭ كەڭلىكى (پىكسېل). بۇ ئاخىرقى قېتىملىق تەسۋىر "
+#~ "يايغان بەتنىڭ قىممىتى."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "تەسۋىر يايىدىغان سۈرەتنىڭ كەڭلىكى (پىكسېل)"
+
+#~ msgid "Direction of scan"
+#~ msgstr "تەسۋىر يېيىش يۆنىلىشى"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "تەسۋىر يايغان سۈرەتنىڭ ئېگىزلىكى (پىكسېل)"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "تەسۋىر يايغان سۈرەتنىڭ ئېگىزلىكى (پىكسېل). بۇ ئاخىرقى قېتىم تەسۋىر يايغان "
+#~ "بەتنىڭ قىممىتى."
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى (چېكىت ھەر دىيۇيم)"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى"
diff --git a/po/uk.po b/po/uk.po
index c26d6e2..c5db064 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 11:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Уповноваження"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "_Користувач ресурсу:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Текстовий"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Фотографія"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Передній і зворотний боки"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Передній бік"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Зворот"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Просте сканування"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "Д_окумент"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "С_канування"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Одинарна _сторінка"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Всі сторінки з _лотка"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "П_рипинити сканування"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Текстовий"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Фотографія"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Надіслати ел. поштою"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "С_торінка"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Обрізати"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Без обрізання"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "_Нетипові"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Обернути область обрізання"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "Пересунути ліворуч"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "Пересунути праворуч"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Довідка"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Вміст"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "Почати новий документ"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Створити"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "Сканувати одну сторінку"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Сканувати"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Зберегти"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "Припинити поточне сканування"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Зупинити"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Обернути ліворуч"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "Обернути праворуч"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "Обрізати позначену сторінку"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Обрізати"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "_Користувач ресурсу:"
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Пароль:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Уповноваження"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Налаштування"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "_Джерело даних сканування:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "Роздільна здатність _тексту:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "Роздільна здатність _фотографій:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "Бік сканування:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "Розмір сторінки:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "Яскравість:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "Контрастність:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "Якість:"
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Передній і зворотний боки"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Передній бік"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Зворот"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Сканувати документи"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "Ширина вікна у пікселях"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "Висота вікна у пікселях"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "Якщо позначено, вікно програми буде максимізовано"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "Пристрій сканування"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "Пристрій SANE, з якого слід отримувати зображення."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "Тип документа, який ви скануєте"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,147 +311,106 @@ msgstr ""
 "Тип документа, який сканується. За значенням цього параметра визначається "
 "роздільна здатність сканування, кольори та способи остаточної обробки."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "Напрямок сканування"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Напрямок сканування на сканованій сторінці."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "Ширина сканованого зображення у пікселях"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина сканованого зображення у пікселях. Це значення буде оновлено на те, "
-"яке було використано для попереднього зображення."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "Висота сканованого зображення у пікселях"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-"Висота сканованого зображення у пікселях. Це значення буде оновлено на те, "
-"яке було використано для попереднього зображення."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "Ширина паперу у десятих міліметра"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "Висота паперу у десятих міліметра"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "Яскравість сканування"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "Коригування яскравості від -100 до 100 (0 — не коригувати)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "Контрастність сканування"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "Коригування контрастності від -100 до 100 (0 — не коригувати)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "Роздільна здатність попереднього сканованого зображення"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-"Роздільна здатність у точках на дюйм попереднього сканованого зображення."
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "Роздільна здатність для сканування тексту"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "Роздільна здатність для сканування фотографій"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "Бік сторінки, який слід сканувати"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Бік сторінки, який буде скановано."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "Каталог збережених файлів"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 "Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
 "вважатиметься каталог документів."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "Значення якості, яке буде використано під час стискання JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "Значення якості, яке буде використано під час стискання JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
 "комп’ютером."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Не вдалося з’єднатися зі сканером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Помилка під час спроби обміну даними зі сканером"
 
@@ -505,98 +452,110 @@ msgstr ""
 "Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
 "командного рядка."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "За_крити"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Зберегти як..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "З_берегти"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Всі файли"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "Вибрати _тип файла"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Якщо ви не збережете внесені зміни, їх буде втрачено остаточно."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -625,16 +584,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -644,98 +603,95 @@ msgstr ""
 "  passtas https://launchpad.net/~passtas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Не виявлено таких файлів"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -766,6 +722,12 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ "  --gtk-module=МОДУЛІ             Завантажити додаткові модулі GTK+\n"
 #~ "  --g-fatal-warnings              Завершувати роботу у разі появи попереджень"
 
+#~ msgid "Direction of scan"
+#~ msgstr "Напрямок сканування"
+
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "Якщо позначено, вікно програми буде максимізовано"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -783,6 +745,12 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ "фотографії. Значення цього параметра впливає на роздільну здатність "
 #~ "сканування, використання кольорів та остаточну обробку зображення."
 
+#~ msgid "Window height in pixels"
+#~ msgstr "Висота вікна у пікселях"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "Ширина вікна у пікселях"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -799,8 +767,38 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ "  --help-all                      Показати всі параметри\n"
 #~ "  --help-gtk                      Показати параметри GTK+"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "Висота сканованого зображення у пікселях"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "Висота сканованого зображення у пікселях. Це значення буде оновлено на те, "
+#~ "яке було використано для попереднього зображення."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "Ширина сканованого зображення у пікселях. Це значення буде оновлено на те, "
+#~ "яке було використано для попереднього зображення."
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "Ширина сканованого зображення у пікселях"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr ""
+#~ "Роздільна здатність у точках на дюйм попереднього сканованого зображення."
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "Роздільна здатність попереднього сканованого зображення"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "Бік паперу,  який слід сканувати. Може мати такі значення: 'both' 'front' "
 #~ "'back'"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Напрямок сканування на сканованій сторінці."
diff --git a/po/ur.po b/po/ur.po
index bed12e3..ffd23b7 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "عبارت"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "تصویر"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "پیچھے"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "عبارت"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "تصویر"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "نیا"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "محفوظ کریں"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "رکیۓ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr ""
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "ترجیحات"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "پیچھے"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -489,98 +441,110 @@ msgstr ""
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -597,16 +561,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -615,94 +579,91 @@ msgstr ""
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
diff --git a/po/uz.po b/po/uz.po
index 21350ba..356a64e 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Maxfiy soʻz:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Matn"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Rasm"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "Olidi va Orqasi"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "Oldingi"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "Orqaga"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Dokument"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "_Skan qilish"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Matn"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Rasm"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Chapga burish"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "_O'nga burish"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Kesish"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Yoʻq"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Xat"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Yordam"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "_Tarkibi"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "Yangi"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "Skan qilish"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "Saqlash"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "Toʻxtatish"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "Chapga burish"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "O'nga burish"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "Kesish"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Maxfiy soʻz:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr ""
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Мослашлар"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "Olidi va Orqasi"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "Oldingi"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "Orqaga"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -491,98 +443,110 @@ msgstr ""
 "Мавжуд буйруқлар ва мосламаларнинг тўлиқ рўйхатини кўриш учун '%s --help''ни "
 "ишга туширинг."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr ""
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr ""
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "Hamma fayllar"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -599,110 +563,107 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sardorbek Pulatov https://launchpad.net/~prockrammer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Fayllar topilmadi"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
+
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
diff --git a/po/vi.po b/po/vi.po
index bdf2c3a..a655635 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,315 +7,303 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "_Xác thực"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "_Mật khẩu:"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "Văn bản"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "Ảnh chụp"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "Quét đơn giản"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "_Tài liệu"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr ""
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "Trang Đơn"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "Tất cả trang từ _Khay (Feeder)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "Văn bản"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "Ảnh chụp"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "_Xén"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "_Không có"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "Tự _chọn"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "_Trợ giúp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr ""
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr ""
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "_Mật khẩu:"
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "_Xác thực"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "Tùy thích"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Độ sáng:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Độ tương phản:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
-msgid "Quality:"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr ""
+msgid "Quality:"
+msgstr "Chất lượng:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
@@ -323,136 +311,100 @@ msgstr ""
 "Loại tài liệu đang quét hình. Tùy chọn này sẽ quyết định độ phân giải quét "
 "hình, màu và quy trình xử lý sau quét hình."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "Hướng quét trang của máy quét hình"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Độ sáng quét hình"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Chỉnh độ sáng từ -100 đến 100 (0 là không có)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Độ tương phản quét hình"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr ""
+msgstr "Chỉnh độ tương phản từ -100 đến 100 (0 là không có)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "Bên trang cần quét hình."
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Xác định chất lượng khi nén ảnh dạng JPEG"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Xác định chất lượng khi nén ảnh dạng JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "Không nối được với máy quét hình"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "Không quét hình được"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "Lỗi khi giao dịch với máy quét hình"
 
@@ -493,98 +445,110 @@ msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Chạy lệnh '%s --help' để xem danh sách tất cả các tùy chọn dòng lệnh."
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Tên đăng nhập và mật mã cần thiết để truy cập '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "Không phát hiện máy quét hình nào hết"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "Lưu thành..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "Không lưu được tệp"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "Không lưu được ảnh cho xem trước"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -613,16 +577,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -631,98 +595,95 @@ msgstr ""
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "Thiếu các tệp"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "Vui lòng kiểm tra lại việc cài đặt"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
-msgstr ""
+msgstr "Tối hơn"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -752,3 +713,6 @@ msgstr ""
 #~ "  --sync                          Make X calls synchronous\n"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "Hướng quét trang của máy quét hình"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1c3aa15..afd8b4e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-09-20 08:05+0000\n"
 "Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "认证(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "资源用户名(_U)："
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "密码(_P)："
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "文本"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "照片"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "正面和背面"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "正面"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "背面"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "扫描易"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "文档(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "扫描(_A)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "单页(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "传送来的所有页面(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "停止扫描(_S)"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "文本"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "照片"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "电子邮件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "页面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "向左旋转(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "向右旋转(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "无(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "信件(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "法定(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "自定义(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "旋转剪裁(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "内容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "开始一个新的文档"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "新建"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "从扫描仪扫描一个单页"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "扫描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "停止当前扫描"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "左旋页面 (逆时针)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "逆时针旋转"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "右旋页面 (顺时针)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "顺时针旋转"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "裁剪选中的页面"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "剪裁"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "资源用户名(_U)："
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "密码(_P)："
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "认证(_A)"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "首选项"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "扫描来源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "文字分辨率(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "图像分辨率(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "扫描页面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "页面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "对比度："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "质量："
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "正面和背面"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "正面"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "背面"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "扫描文档"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "窗口宽度 (像素)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "窗口高度 (像素)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE 如果应用程序窗口是最大化的"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "扫描设备"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "从 SANE 设备获取图像。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "扫描文档的类型"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "扫描方向"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "扫描仪相对于被扫描页面的方向。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "所扫描图像的宽度 (以像素计)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的值。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "所扫描图像的的高度 (以像素计)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的值。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "纸张的宽度 (以 0.1mm 计)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "纸张的高度 (以 0.1mm 计)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "扫描亮度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "扫描对比度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "上次扫描的图片分辨率"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "上次扫描图片的分辨率 (点/英寸)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "文本扫描分辨率"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "上次扫描文档的分辨率 (点/英寸)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "照片扫描分辨率"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "扫描照片时使用的分辨率 (点/英寸)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "扫描纸张的哪面"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "要扫描的页面。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "保存文件的文件夹："
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "JPEG 压缩质量"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG 压缩质量"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "无法连接到扫描仪"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
@@ -489,98 +441,110 @@ msgstr "[设备...] - 扫描工具"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr ""
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "保存为..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr ""
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "所有文件"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "选择文件类型(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不保存，变更将永久丢失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "放弃更改"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -606,16 +570,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -635,98 +599,95 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "文件丢失"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "请检查您的安装"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -755,6 +716,9 @@ msgstr "正在保存 %d/%d 页"
 #~ "  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
 #~ "  --g-fatal-warnings  将所有警告置为致命"
 
+#~ msgid "Direction of scan"
+#~ msgstr "扫描方向"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
@@ -782,6 +746,40 @@ msgstr "正在保存 %d/%d 页"
 #~ "  --help-all 显示所有帮助选项\n"
 #~ "  --help-gtk 显示 GTK+ 选项"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "TRUE 如果应用程序窗口是最大化的"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "上次扫描图片的分辨率 (点/英寸)。"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "上次扫描的图片分辨率"
+
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "所扫描图像的的高度 (以像素计)"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的值。"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的值。"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "窗口高度 (像素)"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "窗口宽度 (像素)"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "所扫描图像的宽度 (以像素计)。"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "扫描仪相对于被扫描页面的方向。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e707b00..0bc44a5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,450 +7,402 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"POT-Creation-Date: 2014-03-04 11:26+1300\n"
 "PO-Revision-Date: 2012-10-25 09:21+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:2
+msgid "_Authorize"
+msgstr "授權(_A)"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:4
+msgid "_Username for resource:"
+msgstr "資源的使用者名稱(_U)："
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:6
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:8
+msgid "Text"
+msgstr "文字"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:10
+msgid "Photo"
+msgstr "相片"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:12
+msgid "Front and Back"
+msgstr "正面與背面"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:14
+msgid "Front"
+msgstr "正面"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Back"
+msgstr "背面"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
 msgstr "掃描易"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:4
+#: ../data/simple-scan.ui.h:20
 msgid "_Document"
 msgstr "文件(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:6
+#: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
 msgstr "掃描(_A)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:8
+#: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
 msgstr "單一頁面(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:10
+#: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:12
+#: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:14
-msgid "Text"
-msgstr "文字"
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:16
-msgid "Photo"
-msgstr "相片"
-
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:18
+#: ../data/simple-scan.ui.h:30
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:20
+#: ../data/simple-scan.ui.h:32
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:38
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:28
+#: ../data/simple-scan.ui.h:40
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:42
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:44
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:46
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:48
 msgid "_Letter"
 msgstr "美規信紙 (_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:50
 msgid "Le_gal"
 msgstr "美規長信紙 (Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:40
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#: ../data/simple-scan.ui.h:52
+msgid "4×6"
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:54
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:58
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:60
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:62
 msgid "_Help"
 msgstr "幫助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:64
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:66
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: ../data/simple-scan.ui.h:55
+#: ../data/simple-scan.ui.h:67
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:57
+#: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
 msgstr "從掃描器掃描單一頁面"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:59
+#: ../data/simple-scan.ui.h:71
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:73
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:74
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:76
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:77
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:87
 msgid "Crop"
 msgstr "裁切"
 
-#. Label beside username entry
-#: ../data/simple-scan.ui.h:77
-msgid "_Username for resource:"
-msgstr "資源的使用者名稱(_U)："
-
-#. Label beside password entry
-#: ../data/simple-scan.ui.h:79
-msgid "_Password:"
-msgstr "密碼(_P)："
-
-#. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:81
-msgid "_Authorize"
-msgstr "授權(_A)"
-
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:89
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:91
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr "文字解析度(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
 msgstr "相片解析度(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:97
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
 msgstr "反差："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:105
 msgid "Quality:"
 msgstr "品質："
 
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:101
-msgid "Front and Back"
-msgstr "正面與背面"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:103
-msgid "Front"
-msgstr "正面"
-
-#. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:105
-msgid "Back"
-msgstr "背面"
-
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "掃描文件"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Window width in pixels"
-msgstr "視窗寬度，單位為像素"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "Window height in pixels"
-msgstr "視窗高度，單位為像素"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "TRUE if the application window is maximized"
-msgstr "如果應用程式視窗最大化時為 TRUE"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid "Device to scan from"
 msgstr "要從哪個裝置掃描"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
 msgstr "取得影像用的 SANE 裝置。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
 msgstr "掃描中文件的類型"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid "Direction of scan"
-msgstr "掃描的方向"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "The direction of the scanner across the scanned page."
-msgstr "掃描器跨越掃描頁面的方向。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "Width of scanned image in pixels"
-msgstr "掃描影像的寬度，單位為像素"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "Height of scanned image in pixels"
-msgstr "掃描影像的高度，單位為像素"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid ""
-"The height of scanned image in pixels. This value is updated to what the "
-"last scanned page was."
-msgstr "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
 msgstr "以 0.1 mm 為單位的紙張寬度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
 msgstr "以 0.1 mm 為單位的紙張高度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
 msgstr "掃描亮度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
 msgstr "掃描反差"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "調整反差，由 -100 至 100 (0 代表無)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Resolution of last scanned image"
-msgstr "上次掃描影像的解析度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
-msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "之前掃描的影像其解析度，單位為 dpi。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
 msgstr "文字掃描的解析度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "當掃描文字時使用的解析度，單位為 dpi。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
 msgstr "相片掃描的解析度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "當掃描相片時使用的解析度，單位為 dpi。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
 msgstr "要掃描的頁面"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
 msgstr "要掃描的頁面。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
 msgstr "儲存檔案的目錄"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
 msgstr "JPEG 壓縮品質"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG 壓縮品質。"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:814
+#: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:844
+#: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1207
+#: ../src/scanner.vala:1219
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+#: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
@@ -489,98 +441,110 @@ msgstr "[裝置...] - 掃描公用程式"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:91
+#: ../src/ui.vala:118
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
+#: ../src/ui.vala:242 ../src/ui.vala:1519
+msgid "_Close"
+msgstr "關閉(_C)"
+
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:159
+#: ../src/ui.vala:250
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "要存取「%s」需要提供使用者名稱與密碼"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:202
+#: ../src/ui.vala:295
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:204
+#: ../src/ui.vala:297
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:363
+#: ../src/ui.vala:433
 msgid "Save As..."
 msgstr "另存為..."
 
+#: ../src/ui.vala:436 ../src/ui.vala:598
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../src/ui.vala:437 ../src/ui.vala:599
+msgid "_Save"
+msgstr "儲存(_S)"
+
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:377
+#: ../src/ui.vala:447
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:383
+#: ../src/ui.vala:453
 msgid "All Files"
 msgstr "所有檔案"
 
 #. 
-#: ../src/ui.vala:388
+#: ../src/ui.vala:458
 msgid "Select File _Type"
 msgstr "選取檔案類型(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:402
+#: ../src/ui.vala:472
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:408
+#: ../src/ui.vala:478
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:414
+#: ../src/ui.vala:484
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:503
+#: ../src/ui.vala:573
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:526
+#: ../src/ui.vala:596
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不儲存，變更將會永久消失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:563
+#: ../src/ui.vala:632
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:565
+#: ../src/ui.vala:634
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:860
+#: ../src/ui.vala:918
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:872
+#: ../src/ui.vala:930
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1119
+#: ../src/ui.vala:1201
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1130
+#: ../src/ui.vala:1222
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -603,16 +567,16 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1133
+#: ../src/ui.vala:1225
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
 #. Description of program
-#: ../src/ui.vala:1136
+#: ../src/ui.vala:1228
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1145
+#: ../src/ui.vala:1237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -625,104 +589,119 @@ msgstr ""
 "  nckuhuahua https://launchpad.net/~nckuhuahua"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1156
+#: ../src/ui.vala:1259
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1158
+#: ../src/ui.vala:1261
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1289
+#: ../src/ui.vala:1380
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1292
+#: ../src/ui.vala:1383
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1295
+#: ../src/ui.vala:1386
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1298
+#: ../src/ui.vala:1389
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.vala:1333
+#: ../src/ui.vala:1444
 msgid "Files missing"
 msgstr "缺少檔案"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.vala:1335
+#: ../src/ui.vala:1446
 msgid "Please check your installation"
 msgstr "請檢查您的安裝是否完整"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1403
+#: ../src/ui.vala:1521
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1409
+#: ../src/ui.vala:1527
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1449
-#, c-format
+#: ../src/ui.vala:1577
 msgid "Darker"
 msgstr "較深"
 
-#: ../src/ui.vala:1451
-#, c-format
+#: ../src/ui.vala:1579
 msgid "Lighter"
 msgstr "較淺"
 
-#: ../src/ui.vala:1458
-#, c-format
+#: ../src/ui.vala:1587
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1460
-#, c-format
+#: ../src/ui.vala:1589
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1467
-#, c-format
+#: ../src/ui.vala:1597
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1469
-#, c-format
+#: ../src/ui.vala:1599
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1637
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: ../src/ui.vala:1545
+#: ../src/ui.vala:1787
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 
+#~ msgid "4&#xD7;6"
+#~ msgstr "4&#xD7;6"
+
+#~ msgid "Direction of scan"
+#~ msgstr "掃描的方向"
+
+#~ msgid "Resolution of last scanned image"
+#~ msgstr "上次掃描影像的解析度"
+
+#~ msgid "Window height in pixels"
+#~ msgstr "視窗高度，單位為像素"
+
+#~ msgid "Window width in pixels"
+#~ msgstr "視窗寬度，單位為像素"
+
+#~ msgid "The resolution in dots-per-inch of the previously scanned image."
+#~ msgstr "之前掃描的影像其解析度，單位為 dpi。"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
 #~ "processing."
 #~ msgstr "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
 
+#~ msgid "TRUE if the application window is maximized"
+#~ msgstr "如果應用程式視窗最大化時為 TRUE"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
@@ -767,6 +746,22 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ "  --gtk-module=MODULES            載入額外的 GTK+ 模組\n"
 #~ "  --g-fatal-warnings              將所有警告設為嚴重的"
 
+#~ msgid "Height of scanned image in pixels"
+#~ msgstr "掃描影像的高度，單位為像素"
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr "掃描影像的高度，單位為像素。此數值會根據最近一次掃描頁面的情況更新。"
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
+
+#~ msgid "Width of scanned image in pixels"
+#~ msgstr "掃描影像的寬度，單位為像素"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
@@ -777,3 +772,6 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgstr ""
 #~ "掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底部)、「bottom-to-top」(底部到頂端)、「left-to-"
 #~ "right」(左到右)、「right-to-left」(右到左)"
+
+#~ msgid "The direction of the scanner across the scanned page."
+#~ msgstr "掃描器跨越掃描頁面的方向。"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6d0f493..5589f1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ simple_scan_VALAFLAGS = \
 	--pkg=gudev-1.0 \
 	--pkg=gio-2.0 \
 	--pkg=gtk+-3.0 \
-	--pkg=sqlite3 \
 	--debug \
 	--target-glib 2.32
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 0a6031b..c099210 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -306,8 +306,7 @@ simple_scan_SOURCES = \
 	resources.c
 
 simple_scan_VALAFLAGS = --pkg=zlib --pkg=gudev-1.0 --pkg=gio-2.0 \
-	--pkg=gtk+-3.0 --pkg=sqlite3 --debug --target-glib 2.32 \
-	$(am__append_1)
+	--pkg=gtk+-3.0 --debug --target-glib 2.32 $(am__append_1)
 simple_scan_CFLAGS = \
 	-w \
 	$(SIMPLE_SCAN_CFLAGS) \
@@ -437,14 +436,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 simple_scan-book.o: book.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-book.o -MD -MP -MF $(DEPDIR)/simple_scan-book.Tpo -c -o simple_scan-book.o `test -f 'book.c' || echo '$(srcdir)/'`book.c
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index a97cb6c..3cb458a 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,9 +1,10 @@
-/* autosave-manager.c generated by valac 0.20.1, the Vala compiler
+/* autosave-manager.c generated by valac 0.22.1, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
  * Copyright (C) 2011 Timo Kluck
- * Author: Timo Kluck <tkluck@infty.nl>
+ * Authors: Timo Kluck <tkluck@infty.nl>
+ *          Robert Ancell <robert.ancell@canonical.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
@@ -11,39 +12,13 @@
  * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
  * license.
  */
-/*
- * We store autosaves in a database named
- *    ~/.cache/simple-scan/autosaves/autosaves.db
- * It contains a single table of pages, each containing the process id (pid) of
- * the simple-scan instance that saved it, and a hash of the Book and Page
- * objects corresponding to it. The pixels are saved as a BLOB.
- * Additionally, the autosaves directory contains a number of tiff files that
- * the user can use for manual recovery.
- *
- * At startup, we check whether autosaves.db contains any records
- * with a pid that does not match a current pid for simple-scan. If so, we take
- * ownership by an UPDATE statement changing to our own pid. Then, we
- * recover the book. We're trying our best to avoid the possible race
- * condition if several instances of simple-scan are started simultaneously.
- *
- * At application exit, we delete the records corresponding to our own pid.
- *
- * Important notes:
- *  - We enforce that there is only one AutosaveManager instance in a given
- *    process by using a create function.
- *  - It should be possible to change the book object at runtime, although this
- *    is not used in the current implementation so it has not been tested.
- */
 
 #include <glib.h>
 #include <glib-object.h>
-#include <sqlite3.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <gio/gio.h>
-#include <float.h>
-#include <math.h>
+#include <glib/gstdio.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -58,16 +33,6 @@ typedef struct _AutosaveManager AutosaveManager;
 typedef struct _AutosaveManagerClass AutosaveManagerClass;
 typedef struct _AutosaveManagerPrivate AutosaveManagerPrivate;
 
-#define TYPE_BOOK (book_get_type ())
-#define BOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BOOK, Book))
-#define BOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BOOK, BookClass))
-#define IS_BOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BOOK))
-#define IS_BOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BOOK))
-#define BOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BOOK, BookClass))
-
-typedef struct _Book Book;
-typedef struct _BookClass BookClass;
-
 #define TYPE_PAGE (page_get_type ())
 #define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
 #define PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE, PageClass))
@@ -77,29 +42,26 @@ typedef struct _BookClass BookClass;
 
 typedef struct _Page Page;
 typedef struct _PageClass PageClass;
-#define _sqlite3_close0(var) ((var == NULL) ? NULL : (var = (sqlite3_close (var), NULL)))
-#define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
+
+#define TYPE_BOOK (book_get_type ())
+#define BOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BOOK, Book))
+#define BOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BOOK, BookClass))
+#define IS_BOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BOOK))
+#define IS_BOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BOOK))
+#define BOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BOOK, BookClass))
+
+typedef struct _Book Book;
+typedef struct _BookClass BookClass;
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-#define _autosave_manager_unref0(var) ((var == NULL) ? NULL : (var = (autosave_manager_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
+#define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
 
 #define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
-
-#define TYPE_SCAN_PAGE_INFO (scan_page_info_get_type ())
-#define SCAN_PAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_PAGE_INFO, ScanPageInfo))
-#define SCAN_PAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_PAGE_INFO, ScanPageInfoClass))
-#define IS_SCAN_PAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_PAGE_INFO))
-#define IS_SCAN_PAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_PAGE_INFO))
-#define SCAN_PAGE_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_PAGE_INFO, ScanPageInfoClass))
-
-typedef struct _ScanPageInfo ScanPageInfo;
-typedef struct _ScanPageInfoClass ScanPageInfoClass;
-typedef struct _ScanPageInfoPrivate ScanPageInfoPrivate;
-#define _scan_page_info_unref0(var) ((var == NULL) ? NULL : (var = (scan_page_info_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
+#define _g_dir_close0(var) ((var == NULL) ? NULL : (var = (g_dir_close (var), NULL)))
 typedef struct _ParamSpecAutosaveManager ParamSpecAutosaveManager;
 
 struct _AutosaveManager {
@@ -114,11 +76,9 @@ struct _AutosaveManagerClass {
 };
 
 struct _AutosaveManagerPrivate {
-	sqlite3* database_connection;
-	Book* _book;
 	guint update_timeout;
-	GHashTable* dirty_pages;
-	gint cur_book_revision;
+	GHashTable* page_filenames;
+	Book* book_;
 };
 
 typedef enum  {
@@ -128,23 +88,6 @@ typedef enum  {
 	SCAN_DIRECTION_RIGHT_TO_LEFT
 } ScanDirection;
 
-struct _ScanPageInfo {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ScanPageInfoPrivate * priv;
-	gint width;
-	gint height;
-	gint depth;
-	gint n_channels;
-	gdouble dpi;
-	gchar* device;
-};
-
-struct _ScanPageInfoClass {
-	GTypeClass parent_class;
-	void (*finalize) (ScanPageInfo *self);
-};
-
 struct _ParamSpecAutosaveManager {
 	GParamSpec parent_instance;
 };
@@ -153,16 +96,10 @@ struct _ParamSpecAutosaveManager {
 static gpointer autosave_manager_parent_class = NULL;
 static gchar* autosave_manager_AUTOSAVE_DIR;
 static gchar* autosave_manager_AUTOSAVE_DIR = NULL;
-static gchar* autosave_manager_AUTOSAVE_NAME;
-static gchar* autosave_manager_AUTOSAVE_NAME = NULL;
-static gchar* autosave_manager_AUTOSAVE_EXT;
-static gchar* autosave_manager_AUTOSAVE_EXT = NULL;
 static gchar* autosave_manager_AUTOSAVE_FILENAME;
 static gchar* autosave_manager_AUTOSAVE_FILENAME = NULL;
-static gchar* autosave_manager_PID;
-static gchar* autosave_manager_PID = NULL;
-static gint autosave_manager_number_of_instances;
-static gint autosave_manager_number_of_instances = 0;
+static gchar* autosave_manager_AUTOSAVE_PATH;
+static gchar* autosave_manager_AUTOSAVE_PATH = NULL;
 
 gpointer autosave_manager_ref (gpointer instance);
 void autosave_manager_unref (gpointer instance);
@@ -171,13 +108,6 @@ void value_set_autosave_manager (GValue* value, gpointer v_object);
 void value_take_autosave_manager (GValue* value, gpointer v_object);
 gpointer value_get_autosave_manager (const GValue* value);
 GType autosave_manager_get_type (void) G_GNUC_CONST;
-gpointer book_ref (gpointer instance);
-void book_unref (gpointer instance);
-GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_book (GValue* value, gpointer v_object);
-void value_take_book (GValue* value, gpointer v_object);
-gpointer value_get_book (const GValue* value);
-GType book_get_type (void) G_GNUC_CONST;
 gpointer page_ref (gpointer instance);
 void page_unref (gpointer instance);
 GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -185,2988 +115,2329 @@ void value_set_page (GValue* value, gpointer v_object);
 void value_take_page (GValue* value, gpointer v_object);
 gpointer value_get_page (const GValue* value);
 GType page_get_type (void) G_GNUC_CONST;
+gpointer book_ref (gpointer instance);
+void book_unref (gpointer instance);
+GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_book (GValue* value, gpointer v_object);
+void value_take_book (GValue* value, gpointer v_object);
+gpointer value_get_book (const GValue* value);
+GType book_get_type (void) G_GNUC_CONST;
 #define AUTOSAVE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AUTOSAVE_MANAGER, AutosaveManagerPrivate))
 enum  {
 	AUTOSAVE_MANAGER_DUMMY_PROPERTY
 };
-AutosaveManager* autosave_manager_create (Book** book);
-static AutosaveManager* autosave_manager_new (void);
-static AutosaveManager* autosave_manager_construct (GType object_type);
-static sqlite3* autosave_manager_open_database_connection (GError** error);
-static void autosave_manager_recover_book (AutosaveManager* self, Book** book);
-void autosave_manager_set_book (AutosaveManager* self, Book* value);
-guint book_get_n_pages (Book* self);
-Page* book_get_page (Book* self, gint page_number);
-static void autosave_manager_on_page_added (AutosaveManager* self, Page* page);
+AutosaveManager* autosave_manager_new (void);
+AutosaveManager* autosave_manager_construct (GType object_type);
 static void _page_unref0_ (gpointer var);
+static void _g_free0_ (gpointer var);
+void autosave_manager_load (AutosaveManager* self);
+Book* autosave_manager_get_book (AutosaveManager* self);
+void book_clear (Book* self);
+static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_);
+static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_);
+GType scan_direction_get_type (void) G_GNUC_CONST;
+static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_);
+Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
+Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
+void book_append_page (Book* self, Page* page);
 void autosave_manager_cleanup (AutosaveManager* self);
-static void autosave_manager_insert_page (AutosaveManager* self, Page* page);
-void autosave_manager_on_page_changed (AutosaveManager* self, Page* page);
-static void _autosave_manager_on_page_changed_page_size_changed (Page* _sender, gpointer self);
-static void _autosave_manager_on_page_changed_page_scan_direction_changed (Page* _sender, gpointer self);
-static void _autosave_manager_on_page_changed_page_crop_changed (Page* _sender, gpointer self);
-static void _autosave_manager_on_page_changed_page_scan_finished (Page* _sender, gpointer self);
+void autosave_manager_on_page_added (AutosaveManager* self, Page* page);
+void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page);
+static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self);
+void autosave_manager_on_changed (AutosaveManager* self);
+static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self);
 void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
-static void _autosave_manager_on_page_changed_page_pixels_changed (Page* _sender, gpointer self);
-Book* autosave_manager_get_book (AutosaveManager* self);
-void autosave_manager_on_reordered (AutosaveManager* self);
-static void autosave_manager_update_page (AutosaveManager* self, Page* page);
-void autosave_manager_on_needs_saving_changed (AutosaveManager* self, Book* book);
+static void autosave_manager_save_pixels (AutosaveManager* self, Page* page);
+static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout);
 void autosave_manager_on_cleared (AutosaveManager* self);
-static gboolean __lambda2_ (AutosaveManager* self);
-static void autosave_manager_real_update_page (AutosaveManager* self, Page* page);
-static gboolean ___lambda2__gsource_func (gpointer self);
-void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height);
-guint book_get_page_index (Book* self, Page* page);
-gint page_get_dpi (Page* self);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
-gint page_get_depth (Page* self);
-gint page_get_n_channels (Page* self);
+static gboolean ___lambda2_ (AutosaveManager* self);
+static void autosave_manager_real_save (AutosaveManager* self);
+static gboolean ____lambda2__gsource_func (gpointer self);
+guint book_get_n_pages (Book* self);
+Page* book_get_page (Book* self, gint page_number);
+gboolean page_get_has_data (Page* self);
+gint page_get_scan_width (Page* self);
+gint page_get_scan_height (Page* self);
 gint page_get_rowstride (Page* self);
-GType scan_direction_get_type (void) G_GNUC_CONST;
+gint page_get_n_channels (Page* self);
+gint page_get_depth (Page* self);
+gint page_get_dpi (Page* self);
 ScanDirection page_get_scan_direction (Page* self);
-gchar* page_get_color_profile (Page* self);
+const gchar* page_get_color_profile (Page* self);
+gboolean page_get_has_crop (Page* self);
+const gchar* page_get_crop_name (Page* self);
+gint page_get_crop_x (Page* self);
+gint page_get_crop_y (Page* self);
+gint page_get_crop_width (Page* self);
+gint page_get_crop_height (Page* self);
 guchar* page_get_pixels (Page* self, int* result_length1);
-void book_clear (Book* self);
-Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction);
-ScanPageInfo* scan_page_info_new (void);
-ScanPageInfo* scan_page_info_construct (GType object_type);
-gpointer scan_page_info_ref (gpointer instance);
-void scan_page_info_unref (gpointer instance);
-GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_scan_page_info (GValue* value, gpointer v_object);
-void value_take_scan_page_info (GValue* value, gpointer v_object);
-gpointer value_get_scan_page_info (const GValue* value);
-GType scan_page_info_get_type (void) G_GNUC_CONST;
-void page_set_page_info (Page* self, ScanPageInfo* info);
-void page_set_color_profile (Page* self, const gchar* color_profile);
-void page_set_custom_crop (Page* self, gint width, gint height);
-void page_move_crop (Page* self, gint x, gint y);
-void page_set_pixels (Page* self, guchar* new_pixels, int new_pixels_length1);
+void autosave_manager_set_book (AutosaveManager* self, Book* value);
 static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self);
 static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self);
-static void _autosave_manager_on_reordered_book_reordered (Book* _sender, gpointer self);
+static void _autosave_manager_on_changed_book_reordered (Book* _sender, gpointer self);
 static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self);
 static void autosave_manager_finalize (AutosaveManager* 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);
 
 
-static gchar* string_strip (const gchar* self) {
-	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _result_;
-	const gchar* _tmp1_;
-#line 1085 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1086 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	_tmp0_ = g_strdup (self);
-#line 1086 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 1087 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	_tmp1_ = _result_;
-#line 1087 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	g_strstrip (_tmp1_);
-#line 1088 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	result = _result_;
-#line 1088 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	return result;
-#line 274 "autosave-manager.c"
+static void _page_unref0_ (gpointer var) {
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
+#line 189 "autosave-manager.c"
 }
 
 
-static const gchar* string_to_string (const gchar* self) {
-	const gchar* result = NULL;
-#line 1274 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1275 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	result = self;
-#line 1275 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-	return result;
-#line 286 "autosave-manager.c"
+static void _g_free0_ (gpointer var) {
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	var = (g_free (var), NULL);
+#line 196 "autosave-manager.c"
+}
+
+
+AutosaveManager* autosave_manager_construct (GType object_type) {
+	AutosaveManager* self = NULL;
+	GHashFunc _tmp0_ = NULL;
+	GEqualFunc _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self = (AutosaveManager*) g_type_create_instance (object_type);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = g_direct_hash;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = g_direct_equal;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _page_unref0_, _g_free0_);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_hash_table_unref0 (self->priv->page_filenames);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->page_filenames = _tmp2_;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return self;
+#line 219 "autosave-manager.c"
+}
+
+
+AutosaveManager* autosave_manager_new (void) {
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return autosave_manager_construct (TYPE_AUTOSAVE_MANAGER);
+#line 226 "autosave-manager.c"
+}
+
+
+static gpointer _page_ref0 (gpointer self) {
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return self ? page_ref (self) : NULL;
+#line 233 "autosave-manager.c"
 }
 
 
-AutosaveManager* autosave_manager_create (Book** book) {
-	AutosaveManager* result = NULL;
-	gint _tmp0_;
-	AutosaveManager* _tmp1_;
-	AutosaveManager* man;
-	gint _tmp2_;
-	gboolean any_pages_recovered;
-	AutosaveManager* _tmp51_;
-	Book* _tmp52_;
-	gboolean _tmp53_;
+void autosave_manager_load (AutosaveManager* self) {
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GKeyFile* file = NULL;
+	GKeyFile* _tmp3_ = NULL;
+	gchar* pages = NULL;
+	GKeyFile* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	gchar** _tmp9_ = NULL;
+	gchar** _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_val_if_fail (*book != NULL, NULL);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = autosave_manager_number_of_instances;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp0_ > 0) {
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_assert_not_reached ();
-#line 309 "autosave-manager.c"
-	}
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = autosave_manager_new ();
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	man = _tmp1_;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = autosave_manager_number_of_instances;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_number_of_instances = _tmp2_ + 1;
-#line 319 "autosave-manager.c"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:64: Loading autosave information");
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = autosave_manager_get_book (self);
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = _tmp0_;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	book_clear (_tmp1_);
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = self->priv->page_filenames;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_remove_all (_tmp2_);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = g_key_file_new ();
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	file = _tmp3_;
+#line 268 "autosave-manager.c"
 	{
-		sqlite3* _tmp3_ = NULL;
-		sqlite3* _tmp4_;
-		AutosaveManager* _tmp5_;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp3_ = autosave_manager_open_database_connection (&_inner_error_);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = _tmp3_;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GKeyFile* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = file;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = autosave_manager_AUTOSAVE_PATH;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_key_file_load_from_file (_tmp4_, _tmp5_, G_KEY_FILE_NONE, &_inner_error_);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 330 "autosave-manager.c"
-			goto __catch23_g_error;
+#line 280 "autosave-manager.c"
+			goto __catch28_g_error;
 		}
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = man;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_close0 (_tmp5_->priv->database_connection);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_->priv->database_connection = _tmp4_;
-#line 339 "autosave-manager.c"
 	}
-	goto __finally23;
-	__catch23_g_error:
+	goto __finally28;
+	__catch28_g_error:
 	{
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GError* e = NULL;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		e = _inner_error_;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:104: Could not connect to the autosave database;" \
-" no autosaves will be kept.");
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = NULL;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_autosave_manager_unref0 (man);
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return result;
-#line 356 "autosave-manager.c"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:76: Could not load autosave infomation; not rest" \
+"oring any autosaves");
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_key_file_unref0 (file);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return;
+#line 300 "autosave-manager.c"
 	}
-	__finally23:
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally28:
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_autosave_manager_unref0 (man);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_key_file_unref0 (file);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return NULL;
-#line 369 "autosave-manager.c"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return;
+#line 313 "autosave-manager.c"
 	}
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	any_pages_recovered = FALSE;
-#line 373 "autosave-manager.c"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = file;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = autosave_manager_get_value (self, _tmp6_, "simple-scan", "pages", "");
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	pages = _tmp7_;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = pages;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = _tmp9_ = g_strsplit (_tmp8_, " ", 0);
+#line 325 "autosave-manager.c"
 	{
-		gchar* current_pids = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_;
-		gchar* _tmp8_ = NULL;
-		sqlite3_stmt* stmt = NULL;
-		const gchar* _tmp9_;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* query;
-		AutosaveManager* _tmp12_;
-		sqlite3* _tmp13_;
-		const gchar* _tmp14_;
-		sqlite3_stmt* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _result_;
-		gint _tmp17_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_spawn_command_line_sync ("pidof simple-scan | sed \"s/ /,/g\"", &_tmp6_, NULL, NULL, &_inner_error_);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (current_pids);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		current_pids = _tmp6_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (current_pids);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 403 "autosave-manager.c"
-				goto __catch24_g_spawn_error;
-			}
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (current_pids);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_autosave_manager_unref0 (man);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			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);
+		gchar** page_name_collection = NULL;
+		gint page_name_collection_length1 = 0;
+		gint _page_name_collection_size_ = 0;
+		gint page_name_it = 0;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection = _tmp10_;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection_length1 = _vala_array_length (_tmp9_);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp9_); page_name_it = page_name_it + 1) {
+#line 337 "autosave-manager.c"
+			gchar* _tmp11_ = NULL;
+			gchar* page_name = NULL;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp11_ = g_strdup (page_name_collection[page_name_it]);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			page_name = _tmp11_;
+#line 344 "autosave-manager.c"
+			{
+				const gchar* _tmp12_ = NULL;
+				gint scan_width = 0;
+				GKeyFile* _tmp13_ = NULL;
+				const gchar* _tmp14_ = NULL;
+				gint _tmp15_ = 0;
+				gint scan_height = 0;
+				GKeyFile* _tmp16_ = NULL;
+				const gchar* _tmp17_ = NULL;
+				gint _tmp18_ = 0;
+				gint rowstride = 0;
+				GKeyFile* _tmp19_ = NULL;
+				const gchar* _tmp20_ = NULL;
+				gint _tmp21_ = 0;
+				gint n_channels = 0;
+				GKeyFile* _tmp22_ = NULL;
+				const gchar* _tmp23_ = NULL;
+				gint _tmp24_ = 0;
+				gint depth = 0;
+				GKeyFile* _tmp25_ = NULL;
+				const gchar* _tmp26_ = NULL;
+				gint _tmp27_ = 0;
+				gint dpi = 0;
+				GKeyFile* _tmp28_ = NULL;
+				const gchar* _tmp29_ = NULL;
+				gint _tmp30_ = 0;
+				gchar* scan_direction_name = NULL;
+				GKeyFile* _tmp31_ = NULL;
+				const gchar* _tmp32_ = NULL;
+				gchar* _tmp33_ = NULL;
+				ScanDirection scan_direction = 0;
+				const gchar* _tmp34_ = NULL;
+				const gchar* _tmp35_ = NULL;
+				GQuark _tmp37_ = 0U;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp36_label0 = 0;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp36_label1 = 0;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp36_label2 = 0;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp36_label3 = 0;
+#line 387 "autosave-manager.c"
+				gchar* color_profile = NULL;
+				GKeyFile* _tmp38_ = NULL;
+				const gchar* _tmp39_ = NULL;
+				gchar* _tmp40_ = NULL;
+				const gchar* _tmp41_ = NULL;
+				gchar* pixels_filename = NULL;
+				GKeyFile* _tmp42_ = NULL;
+				const gchar* _tmp43_ = NULL;
+				gchar* _tmp44_ = NULL;
+				gboolean has_crop = FALSE;
+				GKeyFile* _tmp45_ = NULL;
+				const gchar* _tmp46_ = NULL;
+				gboolean _tmp47_ = FALSE;
+				gchar* crop_name = NULL;
+				GKeyFile* _tmp48_ = NULL;
+				const gchar* _tmp49_ = NULL;
+				gchar* _tmp50_ = NULL;
+				const gchar* _tmp51_ = NULL;
+				gint crop_x = 0;
+				GKeyFile* _tmp52_ = NULL;
+				const gchar* _tmp53_ = NULL;
+				gint _tmp54_ = 0;
+				gint crop_y = 0;
+				GKeyFile* _tmp55_ = NULL;
+				const gchar* _tmp56_ = NULL;
+				gint _tmp57_ = 0;
+				gint crop_width = 0;
+				GKeyFile* _tmp58_ = NULL;
+				const gchar* _tmp59_ = NULL;
+				gint _tmp60_ = 0;
+				gint crop_height = 0;
+				GKeyFile* _tmp61_ = NULL;
+				const gchar* _tmp62_ = NULL;
+				gint _tmp63_ = 0;
+				guchar* pixels = NULL;
+				gint pixels_length1 = 0;
+				gint _pixels_size_ = 0;
+				const gchar* _tmp64_ = NULL;
+				Page* page = NULL;
+				gint _tmp73_ = 0;
+				gint _tmp74_ = 0;
+				gint _tmp75_ = 0;
+				gint _tmp76_ = 0;
+				gint _tmp77_ = 0;
+				gint _tmp78_ = 0;
+				ScanDirection _tmp79_ = 0;
+				const gchar* _tmp80_ = NULL;
+				guchar* _tmp81_ = NULL;
+				gint _tmp81__length1 = 0;
+				gboolean _tmp82_ = FALSE;
+				const gchar* _tmp83_ = NULL;
+				gint _tmp84_ = 0;
+				gint _tmp85_ = 0;
+				gint _tmp86_ = 0;
+				gint _tmp87_ = 0;
+				Page* _tmp88_ = NULL;
+				GHashTable* _tmp89_ = NULL;
+				Page* _tmp90_ = NULL;
+				Page* _tmp91_ = NULL;
+				const gchar* _tmp92_ = NULL;
+				gchar* _tmp93_ = NULL;
+				Book* _tmp94_ = NULL;
+				Book* _tmp95_ = NULL;
+				Page* _tmp96_ = NULL;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp12_ = page_name;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:82: Loading automatically saved page %s", _tmp12_);
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp13_ = file;
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp14_ = page_name;
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = autosave_manager_get_integer (self, _tmp13_, _tmp14_, "scan-width", 0);
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_width = _tmp15_;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp16_ = file;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp17_ = page_name;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-height", 0);
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_height = _tmp18_;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp19_ = file;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp20_ = page_name;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "rowstride", 0);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				rowstride = _tmp21_;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp22_ = file;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp23_ = page_name;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "n-channels", 0);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				n_channels = _tmp24_;
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp25_ = file;
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp26_ = page_name;
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "depth", 0);
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				depth = _tmp27_;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp28_ = file;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp29_ = page_name;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "dpi", 0);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				dpi = _tmp30_;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp31_ = file;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp32_ = page_name;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp33_ = autosave_manager_get_value (self, _tmp31_, _tmp32_, "scan-direction", "");
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_direction_name = _tmp33_;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp34_ = scan_direction_name;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp35_ = _tmp34_;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp37_ = (NULL == _tmp35_) ? 0 : g_quark_from_string (_tmp35_);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp37_ == ((0 != _tmp36_label0) ? _tmp36_label0 : (_tmp36_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					switch (0) {
+#line 524 "autosave-manager.c"
+						default:
+						{
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							break;
+#line 531 "autosave-manager.c"
+						}
+					}
+				} else if (_tmp37_ == ((0 != _tmp36_label1) ? _tmp36_label1 : (_tmp36_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					switch (0) {
+#line 537 "autosave-manager.c"
+						default:
+						{
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							break;
+#line 544 "autosave-manager.c"
+						}
+					}
+				} else if (_tmp37_ == ((0 != _tmp36_label2) ? _tmp36_label2 : (_tmp36_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					switch (0) {
+#line 550 "autosave-manager.c"
+						default:
+						{
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							break;
+#line 557 "autosave-manager.c"
+						}
+					}
+				} else if (_tmp37_ == ((0 != _tmp36_label3) ? _tmp36_label3 : (_tmp36_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					switch (0) {
+#line 563 "autosave-manager.c"
+						default:
+						{
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							break;
+#line 570 "autosave-manager.c"
+						}
+					}
+				}
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp38_ = file;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp39_ = page_name;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp40_ = autosave_manager_get_value (self, _tmp38_, _tmp39_, "color-profile", "");
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				color_profile = _tmp40_;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp41_ = color_profile;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (g_strcmp0 (_tmp41_, "") == 0) {
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (color_profile);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					color_profile = NULL;
+#line 590 "autosave-manager.c"
+				}
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp42_ = file;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp43_ = page_name;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp44_ = autosave_manager_get_value (self, _tmp42_, _tmp43_, "pixels-filename", "");
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				pixels_filename = _tmp44_;
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp45_ = file;
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp46_ = page_name;
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp47_ = autosave_manager_get_boolean (self, _tmp45_, _tmp46_, "has-crop", FALSE);
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				has_crop = _tmp47_;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp48_ = file;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp49_ = page_name;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp50_ = autosave_manager_get_value (self, _tmp48_, _tmp49_, "crop-name", "");
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_name = _tmp50_;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_clear_error (&_inner_error_);
+				_tmp51_ = crop_name;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			return NULL;
-#line 416 "autosave-manager.c"
-		}
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = current_pids;
+				if (g_strcmp0 (_tmp51_, "") == 0) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp8_ = string_strip (_tmp7_);
+					_g_free0 (crop_name);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (current_pids);
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		current_pids = _tmp8_;
+					crop_name = NULL;
+#line 624 "autosave-manager.c"
+				}
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp52_ = file;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp53_ = page_name;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp54_ = autosave_manager_get_integer (self, _tmp52_, _tmp53_, "crop-x", 0);
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_x = _tmp54_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp9_ = current_pids;
+				_tmp55_ = file;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp10_ = string_to_string (_tmp9_);
+				_tmp56_ = page_name;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = g_strconcat ("\n" \
-"                   SELECT process_id, book_hash, book_revision FROM pa" \
-"ges\n" \
-"                   WHERE NOT process_id IN (", _tmp10_, ")\n                   LIMIT 1\n                ", NULL);
+				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-y", 0);
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		query = _tmp11_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = man;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = _tmp12_->priv->database_connection;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = query;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp16_ = sqlite3_prepare_v2 (_tmp13_, _tmp14_, -1, &_tmp15_, NULL);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_finalize0 (stmt);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		stmt = _tmp15_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_result_ = _tmp16_;
+				crop_y = _tmp57_;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp58_ = file;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp59_ = page_name;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-width", 0);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_width = _tmp60_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp61_ = file;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp62_ = page_name;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-height", 0);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_height = _tmp63_;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				pixels = NULL;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				pixels_length1 = 0;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_pixels_size_ = pixels_length1;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp64_ = pixels_filename;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (g_strcmp0 (_tmp64_, "") != 0) {
+#line 668 "autosave-manager.c"
+					gchar* path = NULL;
+					const gchar* _tmp65_ = NULL;
+					const gchar* _tmp66_ = NULL;
+					gchar* _tmp67_ = NULL;
+					GFile* f = NULL;
+					const gchar* _tmp68_ = NULL;
+					GFile* _tmp69_ = NULL;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp65_ = autosave_manager_AUTOSAVE_DIR;
 #line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp17_ = _result_;
+					_tmp66_ = pixels_filename;
 #line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp17_ == SQLITE_OK) {
+					_tmp67_ = g_build_filename (_tmp65_, _tmp66_, NULL);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					path = _tmp67_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp68_ = path;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp69_ = g_file_new_for_path (_tmp68_);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					f = _tmp69_;
+#line 690 "autosave-manager.c"
+					{
+						GFile* _tmp70_ = NULL;
+						guint8* _tmp71_ = NULL;
+						gsize _tmp72_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp70_ = f;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_file_load_contents (_tmp70_, NULL, &_tmp71_, &_tmp72_, NULL, &_inner_error_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels = (g_free (pixels), NULL);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels = _tmp71_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels_length1 = _tmp72_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_pixels_size_ = pixels_length1;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						if (_inner_error_ != NULL) {
+#line 709 "autosave-manager.c"
+							goto __catch29_g_error;
+						}
+					}
+					goto __finally29;
+					__catch29_g_error:
+					{
+						GError* e = NULL;
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			while (TRUE) {
-#line 454 "autosave-manager.c"
-				sqlite3_stmt* _tmp18_;
-				gint _tmp19_ = 0;
-				sqlite3_stmt* _tmp20_;
-				gint _tmp21_ = 0;
-				gint unowned_pid;
-				sqlite3_stmt* _tmp22_;
-				gint _tmp23_ = 0;
-				gint book_hash;
-				sqlite3_stmt* _tmp24_;
-				gint _tmp25_ = 0;
-				gint book_revision;
-				const gchar* _tmp26_;
-				const gchar* _tmp27_ = NULL;
-				gchar* _tmp28_ = NULL;
-				sqlite3_stmt* stmt2 = NULL;
-				AutosaveManager* _tmp29_;
-				sqlite3* _tmp30_;
-				const gchar* _tmp31_;
-				sqlite3_stmt* _tmp32_ = NULL;
-				gint _tmp33_ = 0;
-				gint _tmp34_;
-				sqlite3_stmt* _tmp39_;
-				gint _tmp40_;
-				sqlite3_stmt* _tmp41_;
-				gint _tmp42_;
-				sqlite3_stmt* _tmp43_;
-				gint _tmp44_;
-				sqlite3_stmt* _tmp45_;
-				gint _tmp46_ = 0;
-				gint _tmp47_;
+						e = _inner_error_;
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = stmt;
+						_inner_error_ = NULL;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_warning ("autosave-manager.vala:131: Failed to load pixel information");
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_error_free0 (e);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_object_unref0 (f);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (path);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels = (g_free (pixels), NULL);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (crop_name);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (pixels_filename);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (color_profile);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (scan_direction_name);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (page_name);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						continue;
+#line 743 "autosave-manager.c"
+					}
+					__finally29:
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp19_ = sqlite3_step (_tmp18_);
+					if (_inner_error_ != NULL) {
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(_tmp19_ == SQLITE_ROW)) {
+						_g_object_unref0 (f);
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					break;
-#line 493 "autosave-manager.c"
-				}
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:127: Found at least one autosave page, taking ow" \
-"nership");
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp20_ = stmt;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp21_ = sqlite3_column_int (_tmp20_, 0);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				unowned_pid = _tmp21_;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp22_ = stmt;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp23_ = sqlite3_column_int (_tmp22_, 1);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				book_hash = _tmp23_;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = stmt;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = sqlite3_column_int (_tmp24_, 2);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				book_revision = _tmp25_;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = autosave_manager_PID;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = string_to_string (_tmp26_);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = g_strconcat ("\n" \
-"                        UPDATE pages\n" \
-"                           SET process_id = ", _tmp27_, "\n" \
-"                         WHERE process_id = ?2\n" \
-"                           AND book_hash = ?3\n" \
-"                           AND book_revision = ?4", NULL);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (query);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				query = _tmp28_;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = man;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = _tmp29_->priv->database_connection;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = query;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = sqlite3_prepare_v2 (_tmp30_, _tmp31_, -1, &_tmp32_, NULL);
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_sqlite3_finalize0 (stmt2);
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				stmt2 = _tmp32_;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_result_ = _tmp33_;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = _result_;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp34_ != SQLITE_OK) {
-#line 543 "autosave-manager.c"
-					const gchar* _tmp35_;
-					const gchar* _tmp36_ = NULL;
-					gchar* _tmp37_ = NULL;
-					gchar* _tmp38_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp35_ = query;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp36_ = string_to_string (_tmp35_);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp37_ = g_strconcat ("Error preparing statement: ", _tmp36_, NULL);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp38_ = _tmp37_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					g_warning ("autosave-manager.vala:146: %s", _tmp38_);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp38_);
-#line 560 "autosave-manager.c"
+						_g_free0 (path);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels = (g_free (pixels), NULL);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (crop_name);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (pixels_filename);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (color_profile);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (scan_direction_name);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (page_name);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_free0 (pages);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_g_key_file_unref0 (file);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_clear_error (&_inner_error_);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						return;
+#line 776 "autosave-manager.c"
+					}
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_object_unref0 (f);
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (path);
+#line 782 "autosave-manager.c"
 				}
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = stmt2;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = unowned_pid;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp39_, 2, (gint64) _tmp40_);
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = stmt2;
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = book_hash;
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp41_, 3, (gint64) _tmp42_);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = stmt2;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = book_revision;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp43_, 4, (gint64) _tmp44_);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp73_ = scan_width;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp74_ = scan_height;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp75_ = rowstride;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp76_ = n_channels;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp77_ = depth;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp78_ = dpi;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp79_ = scan_direction;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp80_ = color_profile;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp81_ = pixels;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp81__length1 = pixels_length1;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp82_ = has_crop;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp83_ = crop_name;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84_ = crop_x;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp85_ = crop_y;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp86_ = crop_width;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp87_ = crop_height;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp88_ = page_new_from_data (_tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp81__length1, _tmp82_, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp87_);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp88_;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp45_ = stmt2;
+				_tmp89_ = self->priv->page_filenames;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp46_ = sqlite3_step (_tmp45_);
+				_tmp90_ = page;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_result_ = _tmp46_;
+				_tmp91_ = _page_ref0 (_tmp90_);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp92_ = pixels_filename;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp93_ = g_strdup (_tmp92_);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_hash_table_insert (_tmp89_, _tmp91_, _tmp93_);
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = _result_;
+				_tmp94_ = autosave_manager_get_book (self);
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp47_ == SQLITE_DONE) {
-#line 590 "autosave-manager.c"
-					AutosaveManager* _tmp48_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					any_pages_recovered = TRUE;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp48_ = man;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					autosave_manager_recover_book (_tmp48_, book);
-#line 598 "autosave-manager.c"
-				} else {
-					gint _tmp49_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp49_ = _result_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					g_warning ("autosave-manager.vala:158: Error %d while executing query", _tmp49_);
-#line 605 "autosave-manager.c"
-				}
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_sqlite3_finalize0 (stmt2);
-#line 609 "autosave-manager.c"
+				_tmp95_ = _tmp94_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp96_ = page;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				book_append_page (_tmp95_, _tmp96_);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_page_unref0 (page);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				pixels = (g_free (pixels), NULL);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (crop_name);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (pixels_filename);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (color_profile);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (scan_direction_name);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (page_name);
+#line 854 "autosave-manager.c"
 			}
-		} else {
-			gint _tmp50_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp50_ = _result_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_warning ("autosave-manager.vala:162: Error %d while preparing statement", _tmp50_);
-#line 617 "autosave-manager.c"
 		}
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (query);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_finalize0 (stmt);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (current_pids);
-#line 625 "autosave-manager.c"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
+#line 859 "autosave-manager.c"
+	}
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (pages);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_key_file_unref0 (file);
+#line 865 "autosave-manager.c"
+}
+
+
+static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_) {
+	gchar* result = NULL;
+	GError * _inner_error_ = NULL;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (file != NULL, NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (group_name != NULL, NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (key != NULL, NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (_default_ != NULL, NULL);
+#line 882 "autosave-manager.c"
+	{
+		gchar* _tmp0_ = NULL;
+		GKeyFile* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gchar* _tmp4_ = NULL;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp1_ = file;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp2_ = group_name;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp3_ = key;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = g_key_file_get_value (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp0_ = _tmp4_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_inner_error_ != NULL) {
+#line 901 "autosave-manager.c"
+			goto __catch30_g_error;
+		}
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp0_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return result;
+#line 908 "autosave-manager.c"
 	}
-	goto __finally24;
-	__catch24_g_spawn_error:
+	goto __finally30;
+	__catch30_g_error:
 	{
 		GError* e = NULL;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		const gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:166: Could not obtain current process ids; not r" \
-"estoring any autosaves");
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _default_;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = g_strdup (_tmp5_);
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp6_;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 639 "autosave-manager.c"
-	}
-	__finally24:
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_autosave_manager_unref0 (man);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return NULL;
-#line 652 "autosave-manager.c"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return result;
+#line 930 "autosave-manager.c"
 	}
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp51_ = man;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp52_ = *book;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_set_book (_tmp51_, _tmp52_);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp53_ = any_pages_recovered;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (!_tmp53_) {
-#line 664 "autosave-manager.c"
-		{
-			gint i;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			i = 0;
-#line 669 "autosave-manager.c"
-			{
-				gboolean _tmp54_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = TRUE;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				while (TRUE) {
-#line 676 "autosave-manager.c"
-					gboolean _tmp55_;
-					gint _tmp57_;
-					Book* _tmp58_;
-					guint _tmp59_ = 0U;
-					Book* _tmp60_;
-					gint _tmp61_;
-					Page* _tmp62_ = NULL;
-					Page* page;
-					AutosaveManager* _tmp63_;
-					Page* _tmp64_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp55_ = _tmp54_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!_tmp55_) {
-#line 691 "autosave-manager.c"
-						gint _tmp56_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp56_ = i;
+	__finally30:
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_clear_error (&_inner_error_);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return NULL;
+#line 939 "autosave-manager.c"
+}
+
+
+static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_) {
+	gint result = 0;
+	GError * _inner_error_ = NULL;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (file != NULL, 0);
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (group_name != NULL, 0);
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (key != NULL, 0);
+#line 954 "autosave-manager.c"
+	{
+		gint _tmp0_ = 0;
+		GKeyFile* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gint _tmp4_ = 0;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						i = _tmp56_ + 1;
-#line 697 "autosave-manager.c"
-					}
+		_tmp1_ = file;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp54_ = FALSE;
+		_tmp2_ = group_name;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp57_ = i;
+		_tmp3_ = key;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp58_ = *book;
+		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp59_ = book_get_n_pages (_tmp58_);
+		_tmp0_ = _tmp4_;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!(((guint) _tmp57_) < _tmp59_)) {
+		if (_inner_error_ != NULL) {
+#line 973 "autosave-manager.c"
+			goto __catch31_g_error;
+		}
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						break;
-#line 711 "autosave-manager.c"
-					}
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp60_ = *book;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp61_ = i;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp62_ = book_get_page (_tmp60_, _tmp61_);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page = _tmp62_;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp63_ = man;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp64_ = page;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					autosave_manager_on_page_added (_tmp63_, _tmp64_);
+		result = _tmp0_;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_page_unref0 (page);
-#line 729 "autosave-manager.c"
-				}
-			}
-		}
+		return result;
+#line 980 "autosave-manager.c"
 	}
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	result = man;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 738 "autosave-manager.c"
+	goto __finally31;
+	__catch31_g_error:
+	{
+		GError* e = NULL;
+		gint _tmp5_ = 0;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		e = _inner_error_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_inner_error_ = NULL;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _default_;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp5_;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return result;
+#line 999 "autosave-manager.c"
+	}
+	__finally31:
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_clear_error (&_inner_error_);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return 0;
+#line 1008 "autosave-manager.c"
 }
 
 
-static void _page_unref0_ (gpointer var) {
+static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_) {
+	gboolean result = FALSE;
+	GError * _inner_error_ = NULL;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (file != NULL, FALSE);
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (group_name != NULL, FALSE);
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (key != NULL, FALSE);
+#line 1023 "autosave-manager.c"
+	{
+		gboolean _tmp0_ = FALSE;
+		GKeyFile* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gboolean _tmp4_ = FALSE;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
-#line 745 "autosave-manager.c"
-}
-
-
-static AutosaveManager* autosave_manager_construct (GType object_type) {
-	AutosaveManager* self = NULL;
-	GHashFunc _tmp0_;
-	GEqualFunc _tmp1_;
-	GHashTable* _tmp2_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self = (AutosaveManager*) g_type_create_instance (object_type);
+		_tmp1_ = file;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = g_direct_hash;
+		_tmp2_ = group_name;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = g_direct_equal;
+		_tmp3_ = key;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _page_unref0_, NULL);
+		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_hash_table_unref0 (self->priv->dirty_pages);
+		_tmp0_ = _tmp4_;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->dirty_pages = _tmp2_;
+		if (_inner_error_ != NULL) {
+#line 1042 "autosave-manager.c"
+			goto __catch32_g_error;
+		}
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp0_;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return result;
+#line 1049 "autosave-manager.c"
+	}
+	goto __finally32;
+	__catch32_g_error:
+	{
+		GError* e = NULL;
+		gboolean _tmp5_ = FALSE;
 #line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return self;
-#line 768 "autosave-manager.c"
-}
-
-
-static AutosaveManager* autosave_manager_new (void) {
+		e = _inner_error_;
 #line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return autosave_manager_construct (TYPE_AUTOSAVE_MANAGER);
-#line 775 "autosave-manager.c"
-}
-
-
-static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar** errmsg) {
-	gchar* _vala_errmsg = NULL;
-	gint result = 0;
-	const gchar* sqlite_errmsg = NULL;
-	const gchar* _tmp0_;
-	sqlite3_callback _tmp1_;
-	void* _tmp1__target;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint ec;
-	const gchar* _tmp6_;
-#line 34 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	ec = _tmp3_;
-#line 37 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	if ((&_vala_errmsg) != NULL) {
-#line 808 "autosave-manager.c"
-		const gchar* _tmp4_;
-		gchar* _tmp5_;
-#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-		_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-		_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-		_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-		_vala_errmsg = _tmp5_;
-#line 819 "autosave-manager.c"
-	}
-#line 40 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	result = ec;
-#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	if (errmsg) {
-#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-		*errmsg = _vala_errmsg;
-#line 831 "autosave-manager.c"
-	} else {
-#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-		_g_free0 (_vala_errmsg);
-#line 835 "autosave-manager.c"
+		_inner_error_ = NULL;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _default_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp5_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return result;
+#line 1068 "autosave-manager.c"
 	}
-#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
-	return result;
-#line 839 "autosave-manager.c"
+	__finally32:
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_clear_error (&_inner_error_);
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return FALSE;
+#line 1077 "autosave-manager.c"
 }
 
 
 void autosave_manager_cleanup (AutosaveManager* self) {
-	guint _tmp0_;
-	sqlite3* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_;
-	gint _tmp7_ = 0;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	guint _tmp0_ = 0U;
+	GDir* dir = NULL;
+	GError * _inner_error_ = NULL;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:189: Clean exit; deleting autosave records");
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:194: Deleting autosave records");
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->update_timeout;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ > ((guint) 0)) {
-#line 859 "autosave-manager.c"
-		guint _tmp1_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 1093 "autosave-manager.c"
+		guint _tmp1_ = 0U;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = self->priv->update_timeout;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_source_remove (_tmp1_);
-#line 865 "autosave-manager.c"
+#line 1099 "autosave-manager.c"
 	}
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = self->priv->database_connection;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = autosave_manager_PID;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = string_to_string (_tmp3_);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = g_strconcat ("\n            DELETE FROM pages\n                WHERE process_id = ", _tmp4_, "\n        ", NULL);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = _tmp5_;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = _sqlite3_exec (_tmp2_, _tmp6_, NULL, NULL, NULL);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_warn_if_fail (_tmp7_ == SQLITE_OK);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp6_);
-#line 885 "autosave-manager.c"
-}
-
-
-static sqlite3* autosave_manager_open_database_connection (GError** error) {
-	sqlite3* result = NULL;
-	const gchar* _tmp0_;
-	GFile* _tmp1_ = NULL;
-	GFile* autosaves_dir;
-	sqlite3* connection = NULL;
-	const gchar* _tmp3_;
-	sqlite3* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gchar* _tmp7_;
-	gchar* query;
-	sqlite3* _tmp8_;
-	const gchar* _tmp9_;
-	gint _tmp10_ = 0;
-	gint _result_;
-	gint _tmp11_;
-	GError * _inner_error_ = NULL;
+#line 1103 "autosave-manager.c"
+	{
+		GDir* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		GDir* _tmp4_ = NULL;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = autosave_manager_AUTOSAVE_DIR;
+		_tmp3_ = autosave_manager_AUTOSAVE_DIR;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = g_file_new_for_path (_tmp0_);
+		_tmp4_ = g_dir_open (_tmp3_, (guint) 0, &_inner_error_);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp2_ = _tmp4_;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosaves_dir = _tmp1_;
-#line 912 "autosave-manager.c"
-	{
-		GFile* _tmp2_;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp2_ = autosaves_dir;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_file_make_directory_with_parents (_tmp2_, NULL, &_inner_error_);
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 921 "autosave-manager.c"
-			goto __catch25_g_error;
+#line 1116 "autosave-manager.c"
+			goto __catch33_g_error;
 		}
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (dir);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		dir = _tmp2_;
+#line 1123 "autosave-manager.c"
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_clear_error (&_inner_error_);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GError* e = NULL;
+		GError* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		e = _inner_error_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 932 "autosave-manager.c"
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = e;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = _tmp5_->message;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:207: Failed to delete autosaves: %s", _tmp6_);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (dir);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return;
+#line 1147 "autosave-manager.c"
 	}
-	__finally25:
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally33:
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_propagate_error (error, _inner_error_);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_object_unref0 (autosaves_dir);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return NULL;
-#line 943 "autosave-manager.c"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (dir);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return;
+#line 1160 "autosave-manager.c"
 	}
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	while (TRUE) {
+#line 1164 "autosave-manager.c"
+		gchar* filename = NULL;
+		GDir* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		gchar* path = NULL;
+		const gchar* _tmp11_ = NULL;
+		const gchar* _tmp12_ = NULL;
+		gchar* _tmp13_ = NULL;
+		const gchar* _tmp14_ = NULL;
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = autosave_manager_AUTOSAVE_FILENAME;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = sqlite3_open (_tmp3_, &_tmp4_);
+		_tmp7_ = dir;
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_close0 (connection);
+		_tmp8_ = g_dir_read_name (_tmp7_);
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	connection = _tmp4_;
+		_tmp9_ = g_strdup (_tmp8_);
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp5_ != SQLITE_OK) {
-#line 955 "autosave-manager.c"
-		GError* _tmp6_;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED, "Could not connect to autosave database");
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_inner_error_ = _tmp6_;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_propagate_error (error, _inner_error_);
+		filename = _tmp9_;
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_close0 (connection);
+		_tmp10_ = filename;
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_object_unref0 (autosaves_dir);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		return NULL;
-#line 969 "autosave-manager.c"
-	}
+		if (_tmp10_ == NULL) {
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = g_strdup ("\n" \
-"            CREATE TABLE IF NOT EXISTS pages (\n" \
-"                id integer PRIMARY KEY,\n" \
-"                process_id integer,\n" \
-"                page_hash integer,\n" \
-"                book_hash integer,\n" \
-"                book_revision integer,\n" \
-"                page_number integer,\n" \
-"                dpi integer,\n" \
-"                width integer,\n" \
-"                height integer,\n" \
-"                depth integer,\n" \
-"                n_channels integer,\n" \
-"                rowstride integer,\n" \
-"                color_profile string,\n" \
-"                crop_x integer,\n" \
-"                crop_y integer,\n" \
-"                crop_width integer,\n" \
-"                crop_height integer,\n" \
-"                scan_direction integer,\n" \
-"                pixels binary\n" \
-"            )");
+			_g_free0 (filename);
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	query = _tmp7_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = connection;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = query;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = _sqlite3_exec (_tmp8_, _tmp9_, NULL, NULL, NULL);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp10_;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp11_ = _result_;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp11_ != SQLITE_OK) {
-#line 987 "autosave-manager.c"
-		gint _tmp12_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = _result_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:239: Error %d while executing query", _tmp12_);
-#line 993 "autosave-manager.c"
+			break;
+#line 1191 "autosave-manager.c"
+		}
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp11_ = autosave_manager_AUTOSAVE_DIR;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = filename;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = g_build_filename (_tmp11_, _tmp12_, NULL);
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		path = _tmp13_;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp14_ = path;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_unlink (_tmp14_);
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (path);
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (filename);
+#line 1209 "autosave-manager.c"
 	}
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	result = connection;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (query);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_object_unref0 (autosaves_dir);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 1003 "autosave-manager.c"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_dir_close0 (dir);
+#line 1213 "autosave-manager.c"
 }
 
 
-static void _autosave_manager_on_page_changed_page_size_changed (Page* _sender, gpointer self) {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_changed (self, _sender);
-#line 1010 "autosave-manager.c"
+static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self) {
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_scan_finished (self, _sender);
+#line 1220 "autosave-manager.c"
 }
 
 
-static void _autosave_manager_on_page_changed_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_changed (self, _sender);
-#line 1017 "autosave-manager.c"
+static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self) {
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_changed (self);
+#line 1227 "autosave-manager.c"
 }
 
 
-static void _autosave_manager_on_page_changed_page_crop_changed (Page* _sender, gpointer self) {
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_changed (self, _sender);
-#line 1024 "autosave-manager.c"
+void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = page;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = page;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
+#line 1246 "autosave-manager.c"
 }
 
 
-static void _autosave_manager_on_page_changed_page_scan_finished (Page* _sender, gpointer self) {
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_changed (self, _sender);
-#line 1031 "autosave-manager.c"
+void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
+	Page* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	Page* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	gchar* filename = NULL;
+	GHashTable* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+	gconstpointer _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	GHashTable* _tmp10_ = NULL;
+	Page* _tmp11_ = NULL;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = page;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_parse_name ("scan-finished", TYPE_PAGE, &_tmp1_, NULL, FALSE);
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = page;
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = self->priv->page_filenames;
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = page;
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = g_strdup ((const gchar*) _tmp6_);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	filename = _tmp7_;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = filename;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp8_ != NULL) {
+#line 1293 "autosave-manager.c"
+		const gchar* _tmp9_ = NULL;
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp9_ = filename;
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_unlink (_tmp9_);
+#line 1299 "autosave-manager.c"
+	}
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = self->priv->page_filenames;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = page;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_remove (_tmp10_, _tmp11_);
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (filename);
+#line 1309 "autosave-manager.c"
 }
 
 
-static void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
-	Page* _tmp0_;
-	Page* _tmp1_;
-	Page* _tmp2_;
-	Page* _tmp3_;
-	Page* _tmp4_;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page) {
+	Page* _tmp0_ = NULL;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_insert_page (self, _tmp0_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = page;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp1_, "size-changed", (GCallback) _autosave_manager_on_page_changed_page_size_changed, self);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = page;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp2_, "scan-direction-changed", (GCallback) _autosave_manager_on_page_changed_page_scan_direction_changed, self);
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = page;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_save_pixels (self, _tmp0_);
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_save (self, FALSE);
+#line 1325 "autosave-manager.c"
+}
+
+
+void autosave_manager_on_changed (AutosaveManager* self) {
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_save (self, TRUE);
+#line 1334 "autosave-manager.c"
+}
+
+
+void autosave_manager_on_cleared (AutosaveManager* self) {
+	GHashTable* _tmp0_ = NULL;
 #line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp3_, "crop-changed", (GCallback) _autosave_manager_on_page_changed_page_crop_changed, self);
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = page;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp4_, "scan-finished", (GCallback) _autosave_manager_on_page_changed_page_scan_finished, self);
-#line 1065 "autosave-manager.c"
+	g_return_if_fail (self != NULL);
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->page_filenames;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_remove_all (_tmp0_);
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_save (self, TRUE);
+#line 1348 "autosave-manager.c"
 }
 
 
-static void _autosave_manager_on_page_changed_page_pixels_changed (Page* _sender, gpointer self) {
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_changed (self, _sender);
-#line 1072 "autosave-manager.c"
+static gboolean ___lambda2_ (AutosaveManager* self) {
+	gboolean result = FALSE;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_real_save (self);
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = FALSE;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 1362 "autosave-manager.c"
 }
 
 
-void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
-	Page* _tmp0_;
+static gboolean ____lambda2__gsource_func (gpointer self) {
+	gboolean result;
+	result = ___lambda2_ (self);
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 1371 "autosave-manager.c"
+}
+
+
+static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
+	gboolean _tmp0_ = FALSE;
 	guint _tmp1_ = 0U;
-	Page* _tmp2_;
-	guint _tmp3_ = 0U;
-	Page* _tmp4_;
-	guint _tmp5_ = 0U;
-	Page* _tmp6_;
-	guint _tmp7_ = 0U;
-	Page* _tmp8_;
-	const gchar* _tmp9_;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* query;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3* _tmp12_;
-	const gchar* _tmp13_;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	gint _result_;
-	gint _tmp16_;
-	sqlite3_stmt* _tmp22_;
-	GHashFunc _tmp23_;
-	Page* _tmp24_;
-	guint _tmp25_ = 0U;
-	sqlite3_stmt* _tmp26_;
-	GHashFunc _tmp27_;
-	Book* _tmp28_;
-	Book* _tmp29_;
-	guint _tmp30_ = 0U;
-	sqlite3_stmt* _tmp31_;
-	gint _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	gint _tmp34_ = 0;
-	gint _tmp35_;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = page;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
+	gboolean _tmp3_ = FALSE;
+	guint _tmp4_ = 0U;
+	gboolean _tmp6_ = FALSE;
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_pixels_changed, self);
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = page;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_size_changed, self);
+	g_return_if_fail (self != NULL);
 #line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = page;
+	_tmp1_ = self->priv->update_timeout;
 #line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
+	if (_tmp1_ == ((guint) 0)) {
+#line 1387 "autosave-manager.c"
+		gboolean _tmp2_ = FALSE;
 #line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_scan_direction_changed, self);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = page;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp7_, NULL, FALSE);
+		_tmp2_ = do_timeout;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp0_ = _tmp2_;
+#line 1393 "autosave-manager.c"
+	} else {
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp0_ = FALSE;
+#line 1397 "autosave-manager.c"
+	}
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = _tmp0_;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp3_) {
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_crop_changed, self);
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = page;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp8_, "scan-finished", (GCallback) _autosave_manager_on_page_changed_page_scan_finished, self);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = autosave_manager_PID;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = string_to_string (_tmp9_);
+		g_debug ("autosave-manager.vala:258: Waiting to autosave...");
+#line 1405 "autosave-manager.c"
+	}
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp11_ = g_strconcat ("\n        DELETE FROM pages\n            WHERE process_id = ", _tmp10_, "\n" \
-"              AND page_hash = ?2\n" \
-"              AND book_hash = ?3\n" \
-"              AND book_revision = ?4\n" \
-"        ", NULL);
+	_tmp4_ = self->priv->update_timeout;
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	query = _tmp11_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp12_ = self->priv->database_connection;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp13_ = query;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp15_ = sqlite3_prepare_v2 (_tmp12_, _tmp13_, -1, &_tmp14_, NULL);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	stmt = _tmp14_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp15_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp16_ = _result_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp16_ != SQLITE_OK) {
-#line 1167 "autosave-manager.c"
-		gint _tmp17_;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp17_ = _result_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp18_ = g_strdup_printf ("%i", _tmp17_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp19_ = _tmp18_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp20_ = g_strconcat ("Error ", _tmp19_, " while preparing query", NULL);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp21_ = _tmp20_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:271: %s", _tmp21_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp21_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp19_);
-#line 1189 "autosave-manager.c"
+	if (_tmp4_ > ((guint) 0)) {
+#line 1411 "autosave-manager.c"
+		guint _tmp5_ = 0U;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = self->priv->update_timeout;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_source_remove (_tmp5_);
+#line 1417 "autosave-manager.c"
 	}
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = stmt;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = g_direct_hash;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = page;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp25_ = _tmp23_ (_tmp24_);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp22_, 2, (gint64) _tmp25_);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp26_ = stmt;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp27_ = g_direct_hash;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp28_ = autosave_manager_get_book (self);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp29_ = _tmp28_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp30_ = _tmp27_ (_tmp29_);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp26_, 3, (gint64) _tmp30_);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp31_ = stmt;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp32_ = self->priv->cur_book_revision;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp31_, 4, (gint64) _tmp32_);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp33_ = stmt;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp34_ = sqlite3_step (_tmp33_);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp34_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp35_ = _result_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp35_ != SQLITE_DONE) {
-#line 1229 "autosave-manager.c"
-		gint _tmp36_;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp36_ = _result_;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:278: Error %d while executing query", _tmp36_);
-#line 1235 "autosave-manager.c"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = do_timeout;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp6_) {
+#line 1425 "autosave-manager.c"
+		guint _tmp7_ = 0U;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda2__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		self->priv->update_timeout = _tmp7_;
+#line 1431 "autosave-manager.c"
+	} else {
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		autosave_manager_real_save (self);
+#line 1435 "autosave-manager.c"
 	}
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (query);
-#line 1241 "autosave-manager.c"
 }
 
 
-void autosave_manager_on_reordered (AutosaveManager* self) {
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+static void autosave_manager_real_save (AutosaveManager* self) {
+	GKeyFile* file = NULL;
+	GKeyFile* _tmp0_ = NULL;
+	gchar* page_names = NULL;
+	gchar* _tmp1_ = NULL;
+	GKeyFile* _tmp122_ = NULL;
+	const gchar* _tmp123_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 1248 "autosave-manager.c"
-	{
-		gint i;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:280: Autosaving book information");
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = g_key_file_new ();
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	file = _tmp0_;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = g_strdup ("");
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	page_names = _tmp1_;
+#line 1460 "autosave-manager.c"
+	{
+		gint i = 0;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
-#line 1253 "autosave-manager.c"
+#line 1465 "autosave-manager.c"
 		{
-			gboolean _tmp0_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp0_ = TRUE;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			gboolean _tmp2_ = FALSE;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp2_ = TRUE;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
-#line 1260 "autosave-manager.c"
-				gboolean _tmp1_;
-				gint _tmp3_;
-				Book* _tmp4_;
-				Book* _tmp5_;
-				guint _tmp6_ = 0U;
-				Book* _tmp7_;
-				Book* _tmp8_;
-				gint _tmp9_;
-				Page* _tmp10_ = NULL;
-				Page* page;
-				const gchar* _tmp11_;
-				const gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* query;
-				sqlite3_stmt* stmt = NULL;
-				sqlite3* _tmp14_;
-				const gchar* _tmp15_;
-				sqlite3_stmt* _tmp16_ = NULL;
+#line 1472 "autosave-manager.c"
+				gboolean _tmp3_ = FALSE;
+				gint _tmp5_ = 0;
+				Book* _tmp6_ = NULL;
+				Book* _tmp7_ = NULL;
+				guint _tmp8_ = 0U;
+				guint _tmp9_ = 0U;
+				Page* page = NULL;
+				Book* _tmp10_ = NULL;
+				Book* _tmp11_ = NULL;
+				gint _tmp12_ = 0;
+				Page* _tmp13_ = NULL;
+				Page* _tmp14_ = NULL;
+				gboolean _tmp15_ = FALSE;
+				gboolean _tmp16_ = FALSE;
+				gchar* page_name = NULL;
 				gint _tmp17_ = 0;
-				gint _result_;
-				gint _tmp18_;
-				sqlite3_stmt* _tmp24_;
-				gint _tmp25_;
-				sqlite3_stmt* _tmp26_;
-				GHashFunc _tmp27_;
-				Page* _tmp28_;
-				guint _tmp29_ = 0U;
-				sqlite3_stmt* _tmp30_;
-				GHashFunc _tmp31_;
-				Book* _tmp32_;
-				Book* _tmp33_;
-				guint _tmp34_ = 0U;
-				sqlite3_stmt* _tmp35_;
-				gint _tmp36_;
-				sqlite3_stmt* _tmp37_;
-				gint _tmp38_ = 0;
-				gint _tmp39_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp1_ = _tmp0_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp1_) {
-#line 1302 "autosave-manager.c"
-					gint _tmp2_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp2_ = i;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp2_ + 1;
-#line 1308 "autosave-manager.c"
+				gchar* _tmp18_ = NULL;
+				const gchar* _tmp19_ = NULL;
+				const gchar* _tmp22_ = NULL;
+				const gchar* _tmp23_ = NULL;
+				gchar* _tmp24_ = NULL;
+				const gchar* _tmp25_ = NULL;
+				GKeyFile* _tmp26_ = NULL;
+				const gchar* _tmp27_ = NULL;
+				Page* _tmp28_ = NULL;
+				gint _tmp29_ = 0;
+				gint _tmp30_ = 0;
+				GKeyFile* _tmp31_ = NULL;
+				const gchar* _tmp32_ = NULL;
+				Page* _tmp33_ = NULL;
+				gint _tmp34_ = 0;
+				gint _tmp35_ = 0;
+				GKeyFile* _tmp36_ = NULL;
+				const gchar* _tmp37_ = NULL;
+				Page* _tmp38_ = NULL;
+				gint _tmp39_ = 0;
+				gint _tmp40_ = 0;
+				GKeyFile* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
+				Page* _tmp43_ = NULL;
+				gint _tmp44_ = 0;
+				gint _tmp45_ = 0;
+				GKeyFile* _tmp46_ = NULL;
+				const gchar* _tmp47_ = NULL;
+				Page* _tmp48_ = NULL;
+				gint _tmp49_ = 0;
+				gint _tmp50_ = 0;
+				GKeyFile* _tmp51_ = NULL;
+				const gchar* _tmp52_ = NULL;
+				Page* _tmp53_ = NULL;
+				gint _tmp54_ = 0;
+				gint _tmp55_ = 0;
+				Page* _tmp56_ = NULL;
+				ScanDirection _tmp57_ = 0;
+				ScanDirection _tmp58_ = 0;
+				gchar* _tmp67_ = NULL;
+				Page* _tmp68_ = NULL;
+				const gchar* _tmp69_ = NULL;
+				const gchar* _tmp70_ = NULL;
+				gchar* _tmp71_ = NULL;
+				const gchar* _tmp72_ = NULL;
+				GKeyFile* _tmp74_ = NULL;
+				const gchar* _tmp75_ = NULL;
+				const gchar* _tmp76_ = NULL;
+				gchar* _tmp77_ = NULL;
+				GHashTable* _tmp78_ = NULL;
+				Page* _tmp79_ = NULL;
+				gconstpointer _tmp80_ = NULL;
+				gchar* _tmp81_ = NULL;
+				const gchar* _tmp82_ = NULL;
+				GKeyFile* _tmp84_ = NULL;
+				const gchar* _tmp85_ = NULL;
+				const gchar* _tmp86_ = NULL;
+				GKeyFile* _tmp87_ = NULL;
+				const gchar* _tmp88_ = NULL;
+				Page* _tmp89_ = NULL;
+				gboolean _tmp90_ = FALSE;
+				gboolean _tmp91_ = FALSE;
+				gchar* _tmp92_ = NULL;
+				Page* _tmp93_ = NULL;
+				const gchar* _tmp94_ = NULL;
+				const gchar* _tmp95_ = NULL;
+				gchar* _tmp96_ = NULL;
+				const gchar* _tmp97_ = NULL;
+				GKeyFile* _tmp99_ = NULL;
+				const gchar* _tmp100_ = NULL;
+				const gchar* _tmp101_ = NULL;
+				GKeyFile* _tmp102_ = NULL;
+				const gchar* _tmp103_ = NULL;
+				Page* _tmp104_ = NULL;
+				gint _tmp105_ = 0;
+				gint _tmp106_ = 0;
+				GKeyFile* _tmp107_ = NULL;
+				const gchar* _tmp108_ = NULL;
+				Page* _tmp109_ = NULL;
+				gint _tmp110_ = 0;
+				gint _tmp111_ = 0;
+				GKeyFile* _tmp112_ = NULL;
+				const gchar* _tmp113_ = NULL;
+				Page* _tmp114_ = NULL;
+				gint _tmp115_ = 0;
+				gint _tmp116_ = 0;
+				GKeyFile* _tmp117_ = NULL;
+				const gchar* _tmp118_ = NULL;
+				Page* _tmp119_ = NULL;
+				gint _tmp120_ = 0;
+				gint _tmp121_ = 0;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp3_ = _tmp2_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp3_) {
+#line 1584 "autosave-manager.c"
+					gint _tmp4_ = 0;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp4_ = i;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					i = _tmp4_ + 1;
+#line 1590 "autosave-manager.c"
 				}
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp0_ = FALSE;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp3_ = i;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp4_ = autosave_manager_get_book (self);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp5_ = _tmp4_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp6_ = book_get_n_pages (_tmp5_);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp2_ = FALSE;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp5_ = i;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp6_ = autosave_manager_get_book (self);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp7_ = _tmp6_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp8_ = book_get_n_pages (_tmp7_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp9_ = _tmp8_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp5_) < _tmp9_)) {
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 1324 "autosave-manager.c"
+#line 1608 "autosave-manager.c"
 				}
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp7_ = autosave_manager_get_book (self);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp8_ = _tmp7_;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp9_ = i;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp10_ = book_get_page (_tmp8_, _tmp9_);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp10_;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp11_ = autosave_manager_PID;
+				_tmp10_ = autosave_manager_get_book (self);
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp12_ = string_to_string (_tmp11_);
+				_tmp11_ = _tmp10_;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp13_ = g_strconcat ("\n" \
-"            UPDATE pages SET page_number = ?5\n" \
-"            WHERE process_id = ", _tmp12_, "\n" \
-"              AND page_hash = ?2\n" \
-"              AND book_hash = ?3\n" \
-"              AND book_revision = ?4\n" \
-"            ", NULL);
+				_tmp12_ = i;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				query = _tmp13_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp14_ = self->priv->database_connection;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = query;
+				_tmp13_ = book_get_page (_tmp11_, _tmp12_);
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp13_;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp14_ = page;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = page_get_has_data (_tmp14_);
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp16_ = _tmp15_;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp16_) {
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_page_unref0 (page);
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					continue;
+#line 1632 "autosave-manager.c"
+				}
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp17_ = i;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp18_ = g_strdup_printf ("page-%d", _tmp17_);
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page_name = _tmp18_;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp19_ = page_names;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (g_strcmp0 (_tmp19_, "") != 0) {
+#line 1644 "autosave-manager.c"
+					const gchar* _tmp20_ = NULL;
+					gchar* _tmp21_ = NULL;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp17_ = sqlite3_prepare_v2 (_tmp14_, _tmp15_, -1, &_tmp16_, NULL);
+					_tmp20_ = page_names;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_sqlite3_finalize0 (stmt);
+					_tmp21_ = g_strconcat (_tmp20_, " ", NULL);
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				stmt = _tmp16_;
+					_g_free0 (page_names);
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_result_ = _tmp17_;
+					page_names = _tmp21_;
+#line 1655 "autosave-manager.c"
+				}
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = _result_;
+				_tmp22_ = page_names;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp18_ != SQLITE_OK) {
-#line 1360 "autosave-manager.c"
-					gint _tmp19_;
-					gchar* _tmp20_ = NULL;
-					gchar* _tmp21_;
-					gchar* _tmp22_ = NULL;
-					gchar* _tmp23_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp19_ = _result_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp20_ = g_strdup_printf ("%i", _tmp19_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp21_ = _tmp20_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp22_ = g_strconcat ("Error ", _tmp21_, " while preparing query", NULL);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp23_ = _tmp22_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					g_warning ("autosave-manager.vala:296: %s", _tmp23_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp23_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp21_);
-#line 1382 "autosave-manager.c"
-				}
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = stmt;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = i;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp24_, 5, (gint64) _tmp25_);
+				_tmp23_ = page_name;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (page_names);
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page_names = _tmp24_;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp25_ = page_name;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:297: Autosaving page %s", _tmp25_);
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = stmt;
+				_tmp26_ = file;
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = g_direct_hash;
+				_tmp27_ = page_name;
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp28_ = page;
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = _tmp27_ (_tmp28_);
+				_tmp29_ = page_get_scan_width (_tmp28_);
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp26_, 2, (gint64) _tmp29_);
+				_tmp30_ = _tmp29_;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp26_, _tmp27_, "scan-width", _tmp30_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = stmt;
+				_tmp31_ = file;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = g_direct_hash;
+				_tmp32_ = page_name;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = autosave_manager_get_book (self);
+				_tmp33_ = page;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = _tmp32_;
+				_tmp34_ = page_get_scan_height (_tmp33_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = _tmp31_ (_tmp33_);
+				_tmp35_ = _tmp34_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp30_, 3, (gint64) _tmp34_);
+				g_key_file_set_integer (_tmp31_, _tmp32_, "scan-height", _tmp35_);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp36_ = file;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = stmt;
+				_tmp37_ = page_name;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = self->priv->cur_book_revision;
+				_tmp38_ = page;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				sqlite3_bind_int64 (_tmp35_, 4, (gint64) _tmp36_);
+				_tmp39_ = page_get_rowstride (_tmp38_);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp40_ = _tmp39_;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp36_, _tmp37_, "rowstride", _tmp40_);
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp41_ = file;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp42_ = page_name;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp43_ = page;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp44_ = page_get_n_channels (_tmp43_);
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp45_ = _tmp44_;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp41_, _tmp42_, "n-channels", _tmp45_);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp46_ = file;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp47_ = page_name;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = stmt;
+				_tmp48_ = page;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = sqlite3_step (_tmp37_);
+				_tmp49_ = page_get_depth (_tmp48_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_result_ = _tmp38_;
+				_tmp50_ = _tmp49_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp46_, _tmp47_, "depth", _tmp50_);
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp51_ = file;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp52_ = page_name;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp53_ = page;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = _result_;
+				_tmp54_ = page_get_dpi (_tmp53_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp39_ != SQLITE_DONE) {
-#line 1428 "autosave-manager.c"
-					gint _tmp40_;
+				_tmp55_ = _tmp54_;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp51_, _tmp52_, "dpi", _tmp55_);
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp40_ = _result_;
+				_tmp56_ = page;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					g_warning ("autosave-manager.vala:305: Error %d while executing query", _tmp40_);
-#line 1434 "autosave-manager.c"
-				}
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_sqlite3_finalize0 (stmt);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (query);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_page_unref0 (page);
-#line 1442 "autosave-manager.c"
-			}
-		}
-	}
-}
-
-
-void autosave_manager_on_page_changed (AutosaveManager* self, Page* page) {
-	Page* _tmp0_;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
+				_tmp57_ = page_get_scan_direction (_tmp56_);
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp58_ = _tmp57_;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				switch (_tmp58_) {
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 1753 "autosave-manager.c"
+					{
+						GKeyFile* _tmp59_ = NULL;
+						const gchar* _tmp60_ = NULL;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp59_ = file;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp60_ = page_name;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp59_, _tmp60_, "scan-direction", "TOP_TO_BOTTOM");
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
+						break;
+#line 1765 "autosave-manager.c"
+					}
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 1769 "autosave-manager.c"
+					{
+						GKeyFile* _tmp61_ = NULL;
+						const gchar* _tmp62_ = NULL;
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = page;
+						_tmp61_ = file;
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_update_page (self, _tmp0_);
-#line 1459 "autosave-manager.c"
-}
-
-
-void autosave_manager_on_needs_saving_changed (AutosaveManager* self, Book* book) {
+						_tmp62_ = page_name;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp61_, _tmp62_, "scan-direction", "LEFT_TO_RIGHT");
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						break;
+#line 1781 "autosave-manager.c"
+					}
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 1785 "autosave-manager.c"
+					{
+						GKeyFile* _tmp63_ = NULL;
+						const gchar* _tmp64_ = NULL;
 #line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
+						_tmp63_ = file;
 #line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (book != NULL);
-#line 1468 "autosave-manager.c"
-	{
-		gint n;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		n = 0;
-#line 1473 "autosave-manager.c"
-		{
-			gboolean _tmp0_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp0_ = TRUE;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			while (TRUE) {
-#line 1480 "autosave-manager.c"
-				gboolean _tmp1_;
-				gint _tmp3_;
-				Book* _tmp4_;
-				guint _tmp5_ = 0U;
-				Book* _tmp6_;
-				gint _tmp7_;
-				Page* _tmp8_ = NULL;
-				Page* page;
-				Page* _tmp9_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp1_ = _tmp0_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp1_) {
-#line 1494 "autosave-manager.c"
-					gint _tmp2_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp2_ = n;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					n = _tmp2_ + 1;
-#line 1500 "autosave-manager.c"
-				}
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp0_ = FALSE;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp3_ = n;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp4_ = book;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp5_ = book_get_n_pages (_tmp4_);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp3_) < _tmp5_)) {
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp64_ = page_name;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp63_, _tmp64_, "scan-direction", "BOTTOM_TO_TOP");
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						break;
+#line 1797 "autosave-manager.c"
+					}
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 1801 "autosave-manager.c"
+					{
+						GKeyFile* _tmp65_ = NULL;
+						const gchar* _tmp66_ = NULL;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp65_ = file;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp66_ = page_name;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp65_, _tmp66_, "scan-direction", "RIGHT_TO_LEFT");
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						break;
+#line 1813 "autosave-manager.c"
+					}
+					default:
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 1514 "autosave-manager.c"
+#line 1818 "autosave-manager.c"
 				}
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp6_ = book;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp7_ = n;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp8_;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp9_ = page;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				autosave_manager_update_page (self, _tmp9_);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp68_ = page;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp69_ = page_get_color_profile (_tmp68_);
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp70_ = _tmp69_;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp71_ = g_strdup (_tmp70_);
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp67_ = _tmp71_;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp72_ = _tmp67_;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp72_ == NULL) {
+#line 1834 "autosave-manager.c"
+					gchar* _tmp73_ = NULL;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp73_ = g_strdup ("");
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (_tmp67_);
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp67_ = _tmp73_;
+#line 1842 "autosave-manager.c"
+				}
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp74_ = file;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp75_ = page_name;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp76_ = _tmp67_;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_value (_tmp74_, _tmp75_, "color-profile", _tmp76_);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp78_ = self->priv->page_filenames;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp79_ = page;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp80_ = g_hash_table_lookup (_tmp78_, _tmp79_);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp81_ = g_strdup ((const gchar*) _tmp80_);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp77_ = _tmp81_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp82_ = _tmp77_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp82_ == NULL) {
+#line 1866 "autosave-manager.c"
+					gchar* _tmp83_ = NULL;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp83_ = g_strdup ("");
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (_tmp77_);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp77_ = _tmp83_;
+#line 1874 "autosave-manager.c"
+				}
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84_ = file;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp85_ = page_name;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp86_ = _tmp77_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_value (_tmp84_, _tmp85_, "pixels-filename", _tmp86_);
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp87_ = file;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp88_ = page_name;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp89_ = page;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp90_ = page_get_has_crop (_tmp89_);
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp91_ = _tmp90_;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_boolean (_tmp87_, _tmp88_, "has-crop", _tmp91_);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp93_ = page;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp94_ = page_get_crop_name (_tmp93_);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp95_ = _tmp94_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp96_ = g_strdup (_tmp95_);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp92_ = _tmp96_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp97_ = _tmp92_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp97_ == NULL) {
+#line 1910 "autosave-manager.c"
+					gchar* _tmp98_ = NULL;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp98_ = g_strdup ("");
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (_tmp92_);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp92_ = _tmp98_;
+#line 1918 "autosave-manager.c"
+				}
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp99_ = file;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp100_ = page_name;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp101_ = _tmp92_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_value (_tmp99_, _tmp100_, "crop-name", _tmp101_);
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp102_ = file;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp103_ = page_name;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp104_ = page;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp105_ = page_get_crop_x (_tmp104_);
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp106_ = _tmp105_;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp102_, _tmp103_, "crop-x", _tmp106_);
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp107_ = file;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp108_ = page_name;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp109_ = page;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp110_ = page_get_crop_y (_tmp109_);
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp111_ = _tmp110_;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp107_, _tmp108_, "crop-y", _tmp111_);
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp112_ = file;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp113_ = page_name;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp114_ = page;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp115_ = page_get_crop_width (_tmp114_);
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp116_ = _tmp115_;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp112_, _tmp113_, "crop-width", _tmp116_);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp117_ = file;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp118_ = page_name;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp119_ = page;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp120_ = page_get_crop_height (_tmp119_);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp121_ = _tmp120_;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp117_, _tmp118_, "crop-height", _tmp121_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (_tmp92_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (_tmp77_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (_tmp67_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (page_name);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 1530 "autosave-manager.c"
+#line 1986 "autosave-manager.c"
 			}
 		}
 	}
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp122_ = file;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp123_ = page_names;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_key_file_set_value (_tmp122_, "simple-scan", "pages", _tmp123_);
+#line 1996 "autosave-manager.c"
+	{
+		const gchar* _tmp124_ = NULL;
+		const gchar* _tmp125_ = NULL;
+		GKeyFile* _tmp126_ = NULL;
+		gchar* _tmp127_ = NULL;
+		gchar* _tmp128_ = NULL;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp124_ = autosave_manager_AUTOSAVE_DIR;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_mkdir_with_parents (_tmp124_, 0777);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp125_ = autosave_manager_AUTOSAVE_PATH;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp126_ = file;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp127_ = g_key_file_to_data (_tmp126_, NULL, NULL);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp128_ = _tmp127_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_file_set_contents (_tmp125_, _tmp128_, (gssize) (-1), &_inner_error_);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp128_);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_inner_error_ != NULL) {
+#line 2021 "autosave-manager.c"
+			goto __catch34_g_error;
+		}
+	}
+	goto __finally34;
+	__catch34_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp129_ = NULL;
+		const gchar* _tmp130_ = NULL;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		e = _inner_error_;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_inner_error_ = NULL;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp129_ = e;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp130_ = _tmp129_->message;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:338: Failed to write autosave: %s", _tmp130_);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 2043 "autosave-manager.c"
+	}
+	__finally34:
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_inner_error_ != NULL) {
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (page_names);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_key_file_unref0 (file);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return;
+#line 2058 "autosave-manager.c"
+	}
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (page_names);
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_key_file_unref0 (file);
+#line 2064 "autosave-manager.c"
 }
 
 
-void autosave_manager_on_cleared (AutosaveManager* self) {
-	gint _tmp0_;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->cur_book_revision;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->cur_book_revision = _tmp0_ + 1;
-#line 1545 "autosave-manager.c"
-}
-
-
-static void autosave_manager_insert_page (AutosaveManager* self, Page* page) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* query;
-	sqlite3_stmt* stmt = NULL;
-	sqlite3* _tmp3_;
-	const gchar* _tmp4_;
-	sqlite3_stmt* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _result_;
-	gint _tmp7_;
-	sqlite3_stmt* _tmp13_;
-	GHashFunc _tmp14_;
-	Page* _tmp15_;
-	guint _tmp16_ = 0U;
-	sqlite3_stmt* _tmp17_;
-	GHashFunc _tmp18_;
-	Book* _tmp19_;
-	Book* _tmp20_;
-	guint _tmp21_ = 0U;
-	sqlite3_stmt* _tmp22_;
-	gint _tmp23_;
-	sqlite3_stmt* _tmp24_;
-	gint _tmp25_ = 0;
-	gint _tmp26_;
-	Page* _tmp28_;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
+	gchar* filename = NULL;
+	GHashFunc _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	guint _tmp2_ = 0U;
+	gchar* _tmp3_ = NULL;
+	gchar* path = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	Page* _tmp7_ = NULL;
+	Page* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	GFile* file = NULL;
+	GFile* _tmp10_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:332: Adding an autosave for a new page");
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = autosave_manager_PID;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = string_to_string (_tmp0_);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = g_strconcat ("\n" \
-"            INSERT INTO pages\n" \
-"                (process_id,\n" \
-"                page_hash,\n" \
-"                book_hash,\n" \
-"                book_revision)\n" \
-"                VALUES\n" \
-"                (", _tmp1_, ",\n" \
-"                ?2,\n" \
-"                ?3,\n" \
-"                ?4)\n" \
-"        ", NULL);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	query = _tmp2_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = self->priv->database_connection;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = g_direct_hash;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = page;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = _tmp0_ (_tmp1_);
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = g_strdup_printf ("%u.pixels", _tmp2_);
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	filename = _tmp3_;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = g_build_filename (_tmp4_, filename, NULL);
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	path = _tmp5_;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = query;
+	_tmp6_ = self->priv->page_filenames;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = sqlite3_prepare_v2 (_tmp3_, _tmp4_, -1, &_tmp5_, NULL);
+	_tmp7_ = page;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
+	_tmp8_ = _page_ref0 (_tmp7_);
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	stmt = _tmp5_;
+	_tmp9_ = g_strdup (filename);
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp6_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = _result_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp7_ != SQLITE_OK) {
-#line 1606 "autosave-manager.c"
-		gint _tmp8_;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp8_ = _result_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp9_ = g_strdup_printf ("%i", _tmp8_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp10_ = _tmp9_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = g_strconcat ("Error ", _tmp10_, " while preparing query", NULL);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = _tmp11_;
+	g_hash_table_insert (_tmp6_, _tmp8_, _tmp9_);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:348: %s", _tmp12_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp12_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp10_);
-#line 1628 "autosave-manager.c"
-	}
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp13_ = stmt;
+	g_debug ("autosave-manager.vala:348: Autosaving page pixels to %s", path);
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp14_ = g_direct_hash;
+	_tmp10_ = g_file_new_for_path (path);
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp15_ = page;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp16_ = _tmp14_ (_tmp15_);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp13_, 2, (gint64) _tmp16_);
+	file = _tmp10_;
+#line 2120 "autosave-manager.c"
+	{
+		Page* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
+		guchar* _tmp13_ = NULL;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp11_ = page;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = page_get_pixels (_tmp11_, &_tmp12_);
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_inner_error_ != NULL) {
+#line 2133 "autosave-manager.c"
+			goto __catch35_g_error;
+		}
+	}
+	goto __finally35;
+	__catch35_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp17_ = stmt;
+		e = _inner_error_;
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp18_ = g_direct_hash;
+		_inner_error_ = NULL;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp14_ = e;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp15_ = _tmp14_->message;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:357: Failed to autosave page contents: %s", _tmp15_);
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp19_ = autosave_manager_get_book (self);
+		_g_error_free0 (e);
+#line 2155 "autosave-manager.c"
+	}
+	__finally35:
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp20_ = _tmp19_;
+	if (_inner_error_ != NULL) {
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp21_ = _tmp18_ (_tmp20_);
+		_g_object_unref0 (file);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (path);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (filename);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp17_, 3, (gint64) _tmp21_);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = stmt;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = self->priv->cur_book_revision;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp22_, 4, (gint64) _tmp23_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = stmt;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp25_ = sqlite3_step (_tmp24_);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp25_;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp26_ = _result_;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp26_ != SQLITE_DONE) {
-#line 1668 "autosave-manager.c"
-		gint _tmp27_;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp27_ = _result_;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:356: Error %d while executing query", _tmp27_);
-#line 1674 "autosave-manager.c"
-	}
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp28_ = page;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_update_page (self, _tmp28_);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (query);
-#line 1684 "autosave-manager.c"
-}
-
-
-static gpointer _page_ref0 (gpointer self) {
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return self ? page_ref (self) : NULL;
-#line 1691 "autosave-manager.c"
-}
-
-
-static gboolean __lambda2_ (AutosaveManager* self) {
-	gboolean result = FALSE;
-	GHashTable* _tmp0_;
-	GHashTableIter iter = {0};
-	Page* p = NULL;
-	gboolean is_dirty = FALSE;
-	GHashTable* _tmp6_;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->dirty_pages;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_iter_init (&iter, _tmp0_);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	while (TRUE) {
-#line 1708 "autosave-manager.c"
-		gconstpointer _tmp1_ = NULL;
-		gconstpointer _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		Page* _tmp4_;
-		Page* _tmp5_;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp3_ = g_hash_table_iter_next (&iter, &_tmp1_, &_tmp2_);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_page_unref0 (p);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = _page_ref0 (_tmp1_);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		p = _tmp4_;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		is_dirty = _tmp2_;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (!_tmp3_) {
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			break;
-#line 1728 "autosave-manager.c"
-		}
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = p;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		autosave_manager_real_update_page (self, _tmp5_);
-#line 1734 "autosave-manager.c"
-	}
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = self->priv->dirty_pages;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_remove_all (_tmp6_);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	result = FALSE;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_page_unref0 (p);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 1748 "autosave-manager.c"
-}
-
-
-static gboolean ___lambda2__gsource_func (gpointer self) {
-	gboolean result;
-	result = __lambda2_ (self);
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	return result;
-#line 1757 "autosave-manager.c"
-}
-
-
-static void autosave_manager_update_page (AutosaveManager* self, Page* page) {
-	GHashTable* _tmp0_;
-	Page* _tmp1_;
-	Page* _tmp2_;
-	guint _tmp3_;
-	guint _tmp5_ = 0U;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->dirty_pages;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = page;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = _page_ref0 (_tmp1_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_insert (_tmp0_, _tmp2_, (gpointer) ((gintptr) TRUE));
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = self->priv->update_timeout;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp3_ > ((guint) 0)) {
-#line 1783 "autosave-manager.c"
-		guint _tmp4_;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp4_ = self->priv->update_timeout;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_source_remove (_tmp4_);
-#line 1789 "autosave-manager.c"
-	}
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda2__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = _tmp5_;
-#line 1795 "autosave-manager.c"
-}
-
-
-static void autosave_manager_real_update_page (AutosaveManager* self, Page* page) {
-	gint crop_x = 0;
-	gint crop_y = 0;
-	gint crop_width = 0;
-	gint crop_height = 0;
-	Page* _tmp0_;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	sqlite3_stmt* stmt = NULL;
-	Book* _tmp5_;
-	Book* _tmp6_;
-	Page* _tmp7_;
-	guint _tmp8_ = 0U;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_;
-	Page* _tmp11_;
-	gint _tmp12_ = 0;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_;
-	Page* _tmp15_;
-	gint _tmp16_ = 0;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_;
-	Page* _tmp19_;
-	gint _tmp20_ = 0;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_;
-	Page* _tmp23_;
-	gint _tmp24_ = 0;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_;
-	Page* _tmp27_;
-	gint _tmp28_ = 0;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_;
-	Page* _tmp31_;
-	gint _tmp32_ = 0;
-	gchar* _tmp33_ = NULL;
-	gchar* _tmp34_;
-	gint _tmp35_;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_;
-	gint _tmp38_;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_;
-	gint _tmp41_;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_;
-	gint _tmp44_;
-	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_;
-	Page* _tmp47_;
-	ScanDirection _tmp48_ = 0;
-	gchar* _tmp49_ = NULL;
-	gchar* _tmp50_;
-	const gchar* _tmp51_;
-	const gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_;
-	gchar* query;
-	sqlite3* _tmp55_;
-	const gchar* _tmp56_;
-	sqlite3_stmt* _tmp57_ = NULL;
-	gint _tmp58_ = 0;
-	gint _result_;
-	gint _tmp59_;
-	sqlite3_stmt* _tmp61_;
-	GHashFunc _tmp62_;
-	Page* _tmp63_;
-	guint _tmp64_ = 0U;
-	sqlite3_stmt* _tmp65_;
-	GHashFunc _tmp66_;
-	Book* _tmp67_;
-	Book* _tmp68_;
-	guint _tmp69_ = 0U;
-	sqlite3_stmt* _tmp70_;
-	gint _tmp71_;
-	Page* _tmp72_;
-	gchar* _tmp73_ = NULL;
-	gchar* _tmp74_;
-	const gchar* _tmp75_;
-	sqlite3_stmt* _tmp77_;
-	const gchar* _tmp78_;
-	gchar* _tmp79_;
-	GDestroyNotify _tmp80_;
-	gint _tmp81_ = 0;
-	gint _tmp82_;
-	Page* _tmp84_;
-	gint _tmp85_ = 0;
-	guchar* _tmp86_ = NULL;
-	sqlite3_stmt* _tmp99_;
-	gint _tmp100_ = 0;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (page != NULL);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:383: Updating the autosave for a page");
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = page;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	page_get_crop (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	crop_x = _tmp1_;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	crop_y = _tmp2_;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	crop_width = _tmp3_;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	crop_height = _tmp4_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = autosave_manager_get_book (self);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = _tmp5_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = book_get_page_index (_tmp6_, _tmp7_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = g_strdup_printf ("%u", _tmp8_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = _tmp9_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp11_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp12_ = page_get_dpi (_tmp11_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp13_ = g_strdup_printf ("%i", _tmp12_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp14_ = _tmp13_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp15_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp16_ = page_get_width (_tmp15_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp17_ = g_strdup_printf ("%i", _tmp16_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp18_ = _tmp17_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp19_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp20_ = page_get_height (_tmp19_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp21_ = g_strdup_printf ("%i", _tmp20_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = _tmp21_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = page_get_depth (_tmp23_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp25_ = g_strdup_printf ("%i", _tmp24_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp26_ = _tmp25_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp27_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp28_ = page_get_n_channels (_tmp27_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp29_ = g_strdup_printf ("%i", _tmp28_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp30_ = _tmp29_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp31_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp32_ = page_get_rowstride (_tmp31_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp33_ = g_strdup_printf ("%i", _tmp32_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp34_ = _tmp33_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp35_ = crop_x;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp36_ = g_strdup_printf ("%i", _tmp35_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp37_ = _tmp36_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp38_ = crop_y;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp39_ = g_strdup_printf ("%i", _tmp38_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp40_ = _tmp39_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp41_ = crop_width;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp42_ = g_strdup_printf ("%i", _tmp41_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp43_ = _tmp42_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp44_ = crop_height;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp45_ = g_strdup_printf ("%i", _tmp44_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp46_ = _tmp45_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp47_ = page;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp48_ = page_get_scan_direction (_tmp47_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp49_ = g_strdup_printf ("%i", (gint) _tmp48_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp50_ = _tmp49_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp51_ = autosave_manager_PID;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp52_ = string_to_string (_tmp51_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp53_ = g_strconcat ("\n" \
-"            UPDATE pages\n" \
-"                SET\n" \
-"                page_number=", _tmp10_, ",\n                dpi=", _tmp14_, ",\n                width=", _tmp18_, ",\n                height=", _tmp22_, ",\n                depth=", _tmp26_, ",\n                n_channels=", _tmp30_, ",\n                rowstride=", _tmp34_, ",\n                crop_x=", _tmp37_, ",\n                crop_y=", _tmp40_, ",\n                crop_width=", _tmp43_, ",\n                crop_height=", _tmp46_, ",\n                scan_direction=", _tmp50_, ",\n" \
-"                color_profile=?1,\n" \
-"                pixels=?2\n" \
-"                WHERE process_id = ", _tmp52_, "\n" \
-"                  AND page_hash = ?4\n" \
-"                  AND book_hash = ?5\n" \
-"                  AND book_revision = ?6\n" \
-"            ", NULL);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp54_ = _tmp53_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp50_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp46_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp43_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp40_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp37_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp34_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp30_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp26_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp22_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp18_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp14_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp10_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	query = _tmp54_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp55_ = self->priv->database_connection;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp56_ = query;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp58_ = sqlite3_prepare_v2 (_tmp55_, _tmp56_, -1, &_tmp57_, NULL);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	stmt = _tmp57_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp58_;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp59_ = _result_;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp59_ != SQLITE_OK) {
-#line 2053 "autosave-manager.c"
-		gint _tmp60_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp60_ = _result_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:418: Error %d while preparing statement", _tmp60_);
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (query);
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_finalize0 (stmt);
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 2065 "autosave-manager.c"
-	}
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp61_ = stmt;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp62_ = g_direct_hash;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp63_ = page;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp64_ = _tmp62_ (_tmp63_);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp61_, 4, (gint64) _tmp64_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp65_ = stmt;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp66_ = g_direct_hash;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp67_ = autosave_manager_get_book (self);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp68_ = _tmp67_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp69_ = _tmp66_ (_tmp68_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp65_, 5, (gint64) _tmp69_);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp70_ = stmt;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp71_ = self->priv->cur_book_revision;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	sqlite3_bind_int64 (_tmp70_, 6, (gint64) _tmp71_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp72_ = page;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp73_ = page_get_color_profile (_tmp72_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp74_ = _tmp73_;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp75_ = _tmp74_;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp75_ == NULL) {
-#line 2105 "autosave-manager.c"
-		gchar* _tmp76_;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp76_ = g_strdup ("");
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp74_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp74_ = _tmp76_;
-#line 2113 "autosave-manager.c"
-	}
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp77_ = stmt;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp78_ = _tmp74_;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp79_ = g_strdup (_tmp78_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp80_ = g_free;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp81_ = sqlite3_bind_text (_tmp77_, 1, _tmp79_, -1, _tmp80_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp81_;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp82_ = _result_;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp82_ != SQLITE_OK) {
-#line 2131 "autosave-manager.c"
-		gint _tmp83_;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp83_ = _result_;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:428: Error %d while binding text", _tmp83_);
-#line 2137 "autosave-manager.c"
-	}
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp84_ = page;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp86_ = page_get_pixels (_tmp84_, &_tmp85_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp86_ != NULL) {
-#line 2145 "autosave-manager.c"
-		sqlite3_stmt* _tmp87_;
-		Page* _tmp88_;
-		gint _tmp89_ = 0;
-		guchar* _tmp90_ = NULL;
-		Page* _tmp91_;
-		gint _tmp92_ = 0;
-		guchar* _tmp93_ = NULL;
-		gint _tmp94_ = 0;
-		gint _tmp95_;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp87_ = stmt;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp88_ = page;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp90_ = page_get_pixels (_tmp88_, &_tmp89_);
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp91_ = page;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp93_ = page_get_pixels (_tmp91_, &_tmp92_);
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp94_ = sqlite3_bind_blob (_tmp87_, 2, _tmp90_, _tmp92_, (GDestroyNotify) (-1));
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_result_ = _tmp94_;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp95_ = _result_;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp95_ != SQLITE_OK) {
-#line 2173 "autosave-manager.c"
-			gint _tmp96_;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp96_ = _result_;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_warning ("autosave-manager.vala:435: Error %d while binding blob", _tmp96_);
-#line 2179 "autosave-manager.c"
-		}
-	} else {
-		sqlite3_stmt* _tmp97_;
-		gint _tmp98_ = 0;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp97_ = stmt;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp98_ = sqlite3_bind_null (_tmp97_, 2);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warn_if_fail (_tmp98_ == SQLITE_OK);
-#line 2190 "autosave-manager.c"
-	}
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp99_ = stmt;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp100_ = sqlite3_step (_tmp99_);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_warn_if_fail (_tmp100_ == SQLITE_DONE);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (_tmp74_);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (query);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 2204 "autosave-manager.c"
-}
-
-
-static void autosave_manager_recover_book (AutosaveManager* self, Book** book) {
-	sqlite3_stmt* stmt = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* query;
-	sqlite3* _tmp5_;
-	const gchar* _tmp6_;
-	sqlite3_stmt* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _result_;
-	gint _tmp9_;
-	gboolean first;
-	gboolean _tmp125_;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (self != NULL);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_return_if_fail (*book != NULL);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = autosave_manager_PID;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp1_ = string_to_string (_tmp0_);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = autosave_manager_PID;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = string_to_string (_tmp2_);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = g_strconcat ("\n" \
-"            SELECT process_id,\n" \
-"                page_hash,\n" \
-"                book_hash,\n" \
-"                book_revision,\n" \
-"                page_number,\n" \
-"                dpi,\n" \
-"                width,\n" \
-"                height,\n" \
-"                depth,\n" \
-"                n_channels,\n" \
-"                rowstride,\n" \
-"                color_profile,\n" \
-"                crop_x,\n" \
-"                crop_y,\n" \
-"                crop_width,\n" \
-"                crop_height,\n" \
-"                scan_direction,\n" \
-"                pixels,\n" \
-"                id\n" \
-"            FROM pages\n" \
-"            WHERE process_id = ", _tmp1_, "\n" \
-"              AND book_revision = (\n" \
-"                  SELECT MAX(book_revision) FROM pages WHERE process_i" \
-"d = ", _tmp3_, "\n              )\n            ORDER BY page_number\n        ", NULL);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	query = _tmp4_;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = self->priv->database_connection;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = query;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = sqlite3_prepare_v2 (_tmp5_, _tmp6_, -1, &_tmp7_, NULL);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	stmt = _tmp7_;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_result_ = _tmp8_;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = _result_;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp9_ != SQLITE_OK) {
-#line 2256 "autosave-manager.c"
-		gint _tmp10_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp10_ = _result_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:476: Error %d while preparing statement", _tmp10_);
-#line 2262 "autosave-manager.c"
-	}
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	first = TRUE;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	while (TRUE) {
-#line 2268 "autosave-manager.c"
-		sqlite3_stmt* _tmp11_;
-		gint _tmp12_ = 0;
-		gboolean _tmp13_;
-		sqlite3_stmt* _tmp15_;
-		gint _tmp16_ = 0;
-		gint dpi;
-		sqlite3_stmt* _tmp17_;
-		gint _tmp18_ = 0;
-		gint width;
-		sqlite3_stmt* _tmp19_;
-		gint _tmp20_ = 0;
-		gint height;
-		sqlite3_stmt* _tmp21_;
-		gint _tmp22_ = 0;
-		gint depth;
-		sqlite3_stmt* _tmp23_;
-		gint _tmp24_ = 0;
-		gint n_channels;
-		sqlite3_stmt* _tmp25_;
-		gint _tmp26_ = 0;
-		ScanDirection scan_direction;
-		gboolean _tmp27_ = FALSE;
-		gint _tmp28_;
-		gboolean _tmp30_;
-		gint _tmp31_;
-		gchar* _tmp32_ = NULL;
-		gchar* _tmp33_;
-		gint _tmp34_;
-		gchar* _tmp35_ = NULL;
-		gchar* _tmp36_;
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_;
-		Book* _tmp39_;
-		gint _tmp40_;
-		gint _tmp41_;
-		gint _tmp42_;
-		ScanDirection _tmp43_;
-		Page* _tmp44_ = NULL;
-		Page* new_page;
-		gboolean _tmp45_ = FALSE;
-		gint _tmp46_;
-		gboolean _tmp48_;
-		Page* _tmp64_;
-		sqlite3_stmt* _tmp65_;
-		const gchar* _tmp66_ = NULL;
-		sqlite3_stmt* _tmp67_;
-		gint _tmp68_ = 0;
-		gint crop_x;
-		sqlite3_stmt* _tmp69_;
-		gint _tmp70_ = 0;
-		gint crop_y;
-		sqlite3_stmt* _tmp71_;
-		gint _tmp72_ = 0;
-		gint crop_width;
-		sqlite3_stmt* _tmp73_;
-		gint _tmp74_ = 0;
-		gint crop_height;
-		gboolean _tmp75_ = FALSE;
-		gint _tmp76_;
-		gboolean _tmp78_;
-		sqlite3_stmt* _tmp85_;
-		gint _tmp86_ = 0;
-		guchar* _tmp87_ = NULL;
-		guchar* new_pixels;
-		gint new_pixels_length1;
-		gint _new_pixels_size_;
-		guchar* _tmp88_;
-		gint _tmp88__length1;
-		sqlite3_stmt* _tmp89_;
-		void* _tmp90_ = NULL;
-		sqlite3_stmt* _tmp91_;
-		gint _tmp92_ = 0;
-		Page* _tmp93_;
-		guchar* _tmp94_;
-		gint _tmp94__length1;
-		sqlite3_stmt* _tmp95_;
-		gint _tmp96_ = 0;
-		gint id;
-		gint _tmp97_;
-		gchar* _tmp98_ = NULL;
-		gchar* _tmp99_;
-		gchar* _tmp100_ = NULL;
-		sqlite3_stmt* stmt2 = NULL;
-		sqlite3* _tmp101_;
-		const gchar* _tmp102_;
-		sqlite3_stmt* _tmp103_ = NULL;
-		gint _tmp104_ = 0;
-		gint result2;
-		gint _tmp105_;
-		sqlite3_stmt* _tmp111_;
-		GHashFunc _tmp112_;
-		Page* _tmp113_;
-		guint _tmp114_ = 0U;
-		sqlite3_stmt* _tmp115_;
-		GHashFunc _tmp116_;
-		Book* _tmp117_;
-		guint _tmp118_ = 0U;
-		sqlite3_stmt* _tmp119_;
-		gint _tmp120_;
-		sqlite3_stmt* _tmp121_;
-		gint _tmp122_ = 0;
-		gint _tmp123_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = stmt;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = sqlite3_step (_tmp11_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (!(SQLITE_ROW == _tmp12_)) {
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			break;
-#line 2379 "autosave-manager.c"
-		}
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:481: Found a page that needs to be recovered");
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = first;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp13_) {
-#line 2387 "autosave-manager.c"
-			Book* _tmp14_;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp14_ = *book;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			book_clear (_tmp14_);
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			first = FALSE;
-#line 2395 "autosave-manager.c"
-		}
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp15_ = stmt;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp16_ = sqlite3_column_int (_tmp15_, 5);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		dpi = _tmp16_;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp17_ = stmt;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp18_ = sqlite3_column_int (_tmp17_, 6);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		width = _tmp18_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp19_ = stmt;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp20_ = sqlite3_column_int (_tmp19_, 7);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		height = _tmp20_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp21_ = stmt;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp22_ = sqlite3_column_int (_tmp21_, 8);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		depth = _tmp22_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp23_ = stmt;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp24_ = sqlite3_column_int (_tmp23_, 9);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		n_channels = _tmp24_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp25_ = stmt;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp26_ = sqlite3_column_int (_tmp25_, 16);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		scan_direction = (ScanDirection) _tmp26_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp28_ = width;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp28_ <= 0) {
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp27_ = TRUE;
-#line 2439 "autosave-manager.c"
-		} else {
-			gint _tmp29_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp29_ = height;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp27_ = _tmp29_ <= 0;
-#line 2446 "autosave-manager.c"
-		}
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp30_ = _tmp27_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp30_) {
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			continue;
-#line 2454 "autosave-manager.c"
-		}
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp31_ = width;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp32_ = g_strdup_printf ("%i", _tmp31_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp33_ = _tmp32_;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp34_ = height;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp35_ = g_strdup_printf ("%i", _tmp34_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp36_ = _tmp35_;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp37_ = g_strconcat ("Restoring a page of size ", _tmp33_, " x ", _tmp36_, NULL);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp38_ = _tmp37_;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:497: %s", _tmp38_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp38_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp36_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp33_);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp39_ = *book;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp40_ = width;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp41_ = height;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp42_ = dpi;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp43_ = scan_direction;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp44_ = book_append_page (_tmp39_, _tmp40_, _tmp41_, _tmp42_, _tmp43_);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		new_page = _tmp44_;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp46_ = depth;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp46_ > 0) {
-#line 2498 "autosave-manager.c"
-			gint _tmp47_;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp47_ = n_channels;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp45_ = _tmp47_ > 0;
-#line 2504 "autosave-manager.c"
-		} else {
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp45_ = FALSE;
-#line 2508 "autosave-manager.c"
-		}
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp48_ = _tmp45_;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp48_) {
-#line 2514 "autosave-manager.c"
-			ScanPageInfo* _tmp49_;
-			ScanPageInfo* info;
-			ScanPageInfo* _tmp50_;
-			gint _tmp51_;
-			ScanPageInfo* _tmp52_;
-			gint _tmp53_;
-			ScanPageInfo* _tmp54_;
-			gint _tmp55_;
-			ScanPageInfo* _tmp56_;
-			gint _tmp57_;
-			ScanPageInfo* _tmp58_;
-			gint _tmp59_;
-			ScanPageInfo* _tmp60_;
-			gchar* _tmp61_;
-			Page* _tmp62_;
-			ScanPageInfo* _tmp63_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp49_ = scan_page_info_new ();
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			info = _tmp49_;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp50_ = info;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp51_ = width;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp50_->width = _tmp51_;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp52_ = info;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp53_ = height;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp52_->height = _tmp53_;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp54_ = info;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp55_ = depth;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp54_->depth = _tmp55_;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp56_ = info;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp57_ = n_channels;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp56_->n_channels = _tmp57_;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp58_ = info;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp59_ = dpi;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp58_->dpi = (gdouble) _tmp59_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp60_ = info;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp61_ = g_strdup ("");
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (_tmp60_->device);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp60_->device = _tmp61_;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp62_ = new_page;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp63_ = info;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			page_set_page_info (_tmp62_, _tmp63_);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_scan_page_info_unref0 (info);
-#line 2581 "autosave-manager.c"
-		}
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp64_ = new_page;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp65_ = stmt;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp66_ = sqlite3_column_text (_tmp65_, 11);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_set_color_profile (_tmp64_, _tmp66_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp67_ = stmt;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp68_ = sqlite3_column_int (_tmp67_, 12);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		crop_x = _tmp68_;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp69_ = stmt;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp70_ = sqlite3_column_int (_tmp69_, 13);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		crop_y = _tmp70_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp71_ = stmt;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp72_ = sqlite3_column_int (_tmp71_, 14);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		crop_width = _tmp72_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp73_ = stmt;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp74_ = sqlite3_column_int (_tmp73_, 15);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		crop_height = _tmp74_;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp76_ = crop_width;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp76_ > 0) {
-#line 2619 "autosave-manager.c"
-			gint _tmp77_;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp77_ = crop_height;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp75_ = _tmp77_ > 0;
-#line 2625 "autosave-manager.c"
-		} else {
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp75_ = FALSE;
-#line 2629 "autosave-manager.c"
-		}
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp78_ = _tmp75_;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp78_) {
-#line 2635 "autosave-manager.c"
-			Page* _tmp79_;
-			gint _tmp80_;
-			gint _tmp81_;
-			Page* _tmp82_;
-			gint _tmp83_;
-			gint _tmp84_;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp79_ = new_page;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp80_ = crop_width;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp81_ = crop_height;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			page_set_custom_crop (_tmp79_, _tmp80_, _tmp81_);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp82_ = new_page;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp83_ = crop_x;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp84_ = crop_y;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			page_move_crop (_tmp82_, _tmp83_, _tmp84_);
-#line 2658 "autosave-manager.c"
-		}
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp85_ = stmt;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp86_ = sqlite3_column_bytes (_tmp85_, 17);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp87_ = g_new0 (guchar, _tmp86_);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		new_pixels = _tmp87_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		new_pixels_length1 = _tmp86_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_new_pixels_size_ = new_pixels_length1;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp88_ = new_pixels;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp88__length1 = new_pixels_length1;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp89_ = stmt;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp90_ = sqlite3_column_blob (_tmp89_, 17);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp91_ = stmt;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp92_ = sqlite3_column_bytes (_tmp91_, 17);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		memcpy (_tmp88_, _tmp90_, (gsize) _tmp92_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp93_ = new_page;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp94_ = new_pixels;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp94__length1 = new_pixels_length1;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_set_pixels (_tmp93_, _tmp94_, _tmp94__length1);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp95_ = stmt;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp96_ = sqlite3_column_int (_tmp95_, 18);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		id = _tmp96_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:528: Updating autosave to point to our new copy " \
-"of the page");
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp97_ = id;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp98_ = g_strdup_printf ("%i", _tmp97_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp99_ = _tmp98_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp100_ = g_strconcat ("\n" \
-"                UPDATE pages\n" \
-"                   SET page_hash=?1,\n" \
-"                       book_hash=?2,\n" \
-"                       book_revision=?3\n" \
-"                WHERE id = ", _tmp99_, "\n            ", NULL);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (query);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		query = _tmp100_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp99_);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp101_ = self->priv->database_connection;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp102_ = query;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp104_ = sqlite3_prepare_v2 (_tmp101_, _tmp102_, -1, &_tmp103_, NULL);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_finalize0 (stmt2);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		stmt2 = _tmp103_;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result2 = _tmp104_;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp105_ = result2;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp105_ != SQLITE_OK) {
-#line 2732 "autosave-manager.c"
-			gint _tmp106_;
-			gchar* _tmp107_ = NULL;
-			gchar* _tmp108_;
-			gchar* _tmp109_ = NULL;
-			gchar* _tmp110_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp106_ = result2;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp107_ = g_strdup_printf ("%i", _tmp106_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp108_ = _tmp107_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp109_ = g_strconcat ("Error ", _tmp108_, " while preparing query", NULL);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp110_ = _tmp109_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_warning ("autosave-manager.vala:540: %s", _tmp110_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (_tmp110_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (_tmp108_);
-#line 2754 "autosave-manager.c"
-		}
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp111_ = stmt2;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp112_ = g_direct_hash;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp113_ = new_page;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp114_ = _tmp112_ (_tmp113_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		sqlite3_bind_int64 (_tmp111_, 1, (gint64) _tmp114_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp115_ = stmt2;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp116_ = g_direct_hash;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp117_ = *book;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp118_ = _tmp116_ (_tmp117_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		sqlite3_bind_int64 (_tmp115_, 2, (gint64) _tmp118_);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp119_ = stmt2;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp120_ = self->priv->cur_book_revision;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		sqlite3_bind_int64 (_tmp119_, 3, (gint64) _tmp120_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp121_ = stmt2;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp122_ = sqlite3_step (_tmp121_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result2 = _tmp122_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp123_ = result2;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp123_ != SQLITE_DONE) {
-#line 2792 "autosave-manager.c"
-			gint _tmp124_;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp124_ = _result_;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			g_warning ("autosave-manager.vala:547: Error %d while executing query", _tmp124_);
-#line 2798 "autosave-manager.c"
-		}
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_sqlite3_finalize0 (stmt2);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		new_pixels = (g_free (new_pixels), NULL);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_page_unref0 (new_page);
-#line 2806 "autosave-manager.c"
-	}
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp125_ = first;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp125_) {
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:551: No pages found to recover");
-#line 2814 "autosave-manager.c"
+#line 2172 "autosave-manager.c"
 	}
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_free0 (query);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_finalize0 (stmt);
-#line 2820 "autosave-manager.c"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_object_unref0 (file);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (path);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (filename);
+#line 2180 "autosave-manager.c"
 }
 
 
 Book* autosave_manager_get_book (AutosaveManager* self) {
 	Book* result;
-	Book* _tmp0_;
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	Book* _tmp0_ = NULL;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->_book;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->book_;
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	result = _tmp0_;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 2835 "autosave-manager.c"
+#line 2195 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_page_added (self, page);
-#line 2842 "autosave-manager.c"
+#line 2202 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_page_removed (self, page);
-#line 2849 "autosave-manager.c"
+#line 2209 "autosave-manager.c"
 }
 
 
-static void _autosave_manager_on_reordered_book_reordered (Book* _sender, gpointer self) {
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_reordered (self);
-#line 2856 "autosave-manager.c"
+static void _autosave_manager_on_changed_book_reordered (Book* _sender, gpointer self) {
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_changed (self);
+#line 2216 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self) {
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_cleared (self);
-#line 2863 "autosave-manager.c"
+#line 2223 "autosave-manager.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? book_ref (self) : NULL;
-#line 2870 "autosave-manager.c"
+#line 2230 "autosave-manager.c"
 }
 
 
 void autosave_manager_set_book (AutosaveManager* self, Book* value) {
-	Book* _tmp0_;
-	Book* _tmp19_;
-	Book* _tmp20_;
-	Book* _tmp21_;
-	Book* _tmp22_;
-	Book* _tmp23_;
-	Book* _tmp24_;
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	Book* _tmp0_ = NULL;
+	Book* _tmp20_ = NULL;
+	Book* _tmp21_ = NULL;
+	Book* _tmp22_ = NULL;
+	Book* _tmp23_ = NULL;
+	Book* _tmp24_ = NULL;
+	Book* _tmp25_ = NULL;
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp0_ = self->priv->_book;
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->book_;
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ != NULL) {
-#line 2888 "autosave-manager.c"
-		Book* _tmp11_;
-		guint _tmp12_ = 0U;
-		Book* _tmp13_;
-		guint _tmp14_ = 0U;
-		Book* _tmp15_;
-		guint _tmp16_ = 0U;
-		Book* _tmp17_;
-		guint _tmp18_ = 0U;
+#line 2248 "autosave-manager.c"
+		Book* _tmp12_ = NULL;
+		guint _tmp13_ = 0U;
+		Book* _tmp14_ = NULL;
+		guint _tmp15_ = 0U;
+		Book* _tmp16_ = NULL;
+		guint _tmp17_ = 0U;
+		Book* _tmp18_ = NULL;
+		guint _tmp19_ = 0U;
 		{
-			gint i;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			gint i = 0;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			i = 0;
-#line 2901 "autosave-manager.c"
+#line 2261 "autosave-manager.c"
 			{
-				gboolean _tmp1_;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				gboolean _tmp1_ = FALSE;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp1_ = TRUE;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				while (TRUE) {
-#line 2908 "autosave-manager.c"
-					gboolean _tmp2_;
-					gint _tmp4_;
-					Book* _tmp5_;
+#line 2268 "autosave-manager.c"
+					gboolean _tmp2_ = FALSE;
+					gint _tmp4_ = 0;
+					Book* _tmp5_ = NULL;
 					guint _tmp6_ = 0U;
-					Book* _tmp7_;
-					gint _tmp8_;
-					Page* _tmp9_ = NULL;
-					Page* page;
-					Page* _tmp10_;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					guint _tmp7_ = 0U;
+					Page* page = NULL;
+					Book* _tmp8_ = NULL;
+					gint _tmp9_ = 0;
+					Page* _tmp10_ = NULL;
+					Page* _tmp11_ = NULL;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp2_ = _tmp1_;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (!_tmp2_) {
-#line 2922 "autosave-manager.c"
-						gint _tmp3_;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 2283 "autosave-manager.c"
+						gint _tmp3_ = 0;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp3_ = i;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						i = _tmp3_ + 1;
-#line 2928 "autosave-manager.c"
+#line 2289 "autosave-manager.c"
 					}
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp1_ = FALSE;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp4_ = i;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp5_ = self->priv->_book;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp5_ = self->priv->book_;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp6_ = book_get_n_pages (_tmp5_);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!(((guint) _tmp4_) < _tmp6_)) {
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp7_ = _tmp6_;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					if (!(((guint) _tmp4_) < _tmp7_)) {
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 2942 "autosave-manager.c"
+#line 2305 "autosave-manager.c"
 					}
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp7_ = self->priv->_book;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp8_ = i;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp9_ = book_get_page (_tmp7_, _tmp8_);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page = _tmp9_;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp10_ = page;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					autosave_manager_on_page_removed (self, _tmp10_);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp8_ = self->priv->book_;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp9_ = i;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp10_ = book_get_page (_tmp8_, _tmp9_);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					page = _tmp10_;
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp11_ = page;
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					autosave_manager_on_page_removed (self, _tmp11_);
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_page_unref0 (page);
-#line 2958 "autosave-manager.c"
+#line 2321 "autosave-manager.c"
 				}
 			}
 		}
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = self->priv->_book;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp12_, NULL, FALSE);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = self->priv->_book;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp14_, NULL, FALSE);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp15_ = self->priv->_book;
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp16_, NULL, FALSE);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _autosave_manager_on_reordered_book_reordered, self);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp17_ = self->priv->_book;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp18_, NULL, FALSE);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 2986 "autosave-manager.c"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = self->priv->book_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp13_, NULL, FALSE);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp14_ = self->priv->book_;
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp15_, NULL, FALSE);
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp16_ = self->priv->book_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp17_, NULL, FALSE);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _autosave_manager_on_changed_book_reordered, self);
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp18_ = self->priv->book_;
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp19_, NULL, FALSE);
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2349 "autosave-manager.c"
 	}
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp19_ = value;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp20_ = _book_ref0 (_tmp19_);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_book_unref0 (self->priv->_book);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->_book = _tmp20_;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp21_ = self->priv->_book;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp21_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = self->priv->_book;
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp22_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = self->priv->_book;
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp23_, "reordered", (GCallback) _autosave_manager_on_reordered_book_reordered, self);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = self->priv->_book;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp24_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 3012 "autosave-manager.c"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp20_ = value;
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp21_ = _book_ref0 (_tmp20_);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_book_unref0 (self->priv->book_);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->book_ = _tmp21_;
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp22_ = self->priv->book_;
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp22_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp23_ = self->priv->book_;
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp23_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp24_ = self->priv->book_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp24_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp25_ = self->priv->book_;
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp25_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2375 "autosave-manager.c"
 	{
-		gint i;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		gint i = 0;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
-#line 3017 "autosave-manager.c"
+#line 2380 "autosave-manager.c"
 		{
-			gboolean _tmp25_;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp25_ = TRUE;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			gboolean _tmp26_ = FALSE;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp26_ = TRUE;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
-#line 3024 "autosave-manager.c"
-				gboolean _tmp26_;
-				gint _tmp28_;
-				Book* _tmp29_;
-				guint _tmp30_ = 0U;
-				Book* _tmp31_;
-				Book* _tmp32_;
-				gint _tmp33_;
-				Page* _tmp34_ = NULL;
-				Page* page;
-				Page* _tmp35_;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = _tmp25_;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp26_) {
-#line 3039 "autosave-manager.c"
-					gint _tmp27_;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp27_ = i;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp27_ + 1;
-#line 3045 "autosave-manager.c"
+#line 2387 "autosave-manager.c"
+				gboolean _tmp27_ = FALSE;
+				gint _tmp29_ = 0;
+				Book* _tmp30_ = NULL;
+				guint _tmp31_ = 0U;
+				guint _tmp32_ = 0U;
+				Page* page = NULL;
+				Book* _tmp33_ = NULL;
+				gint _tmp34_ = 0;
+				Page* _tmp35_ = NULL;
+				Page* _tmp36_ = NULL;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp27_ = _tmp26_;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp27_) {
+#line 2402 "autosave-manager.c"
+					gint _tmp28_ = 0;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp28_ = i;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					i = _tmp28_ + 1;
+#line 2408 "autosave-manager.c"
 				}
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = FALSE;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = i;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = self->priv->_book;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = book_get_n_pages (_tmp29_);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp28_) < _tmp30_)) {
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp26_ = FALSE;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp29_ = i;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp30_ = self->priv->book_;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp31_ = book_get_n_pages (_tmp30_);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp32_ = _tmp31_;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp29_) < _tmp32_)) {
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 3059 "autosave-manager.c"
+#line 2424 "autosave-manager.c"
 				}
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = autosave_manager_get_book (self);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = _tmp31_;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = i;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = book_get_page (_tmp32_, _tmp33_);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp34_;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = page;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				autosave_manager_on_page_added (self, _tmp35_);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp33_ = self->priv->book_;
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp34_ = i;
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp35_ = book_get_page (_tmp33_, _tmp34_);
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp35_;
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp36_ = page;
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				autosave_manager_on_page_added (self, _tmp36_);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 3077 "autosave-manager.c"
+#line 2440 "autosave-manager.c"
 			}
 		}
 	}
@@ -3174,181 +2445,181 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 
 
 static void value_autosave_manager_init (GValue* value) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	value->data[0].v_pointer = NULL;
-#line 3087 "autosave-manager.c"
+#line 2450 "autosave-manager.c"
 }
 
 
 static void value_autosave_manager_free_value (GValue* value) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (value->data[0].v_pointer) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (value->data[0].v_pointer);
-#line 3096 "autosave-manager.c"
+#line 2459 "autosave-manager.c"
 	}
 }
 
 
 static void value_autosave_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (src_value->data[0].v_pointer) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = autosave_manager_ref (src_value->data[0].v_pointer);
-#line 3106 "autosave-manager.c"
+#line 2469 "autosave-manager.c"
 	} else {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3110 "autosave-manager.c"
+#line 2473 "autosave-manager.c"
 	}
 }
 
 
 static gpointer value_autosave_manager_peek_pointer (const GValue* value) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
-#line 3118 "autosave-manager.c"
+#line 2481 "autosave-manager.c"
 }
 
 
 static gchar* value_autosave_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (collect_values[0].v_pointer) {
-#line 3125 "autosave-manager.c"
+#line 2488 "autosave-manager.c"
 		AutosaveManager* object;
 		object = collect_values[0].v_pointer;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3132 "autosave-manager.c"
+#line 2495 "autosave-manager.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3136 "autosave-manager.c"
+#line 2499 "autosave-manager.c"
 		}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = autosave_manager_ref (object);
-#line 3140 "autosave-manager.c"
+#line 2503 "autosave-manager.c"
 	} else {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 3144 "autosave-manager.c"
+#line 2507 "autosave-manager.c"
 	}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 3148 "autosave-manager.c"
+#line 2511 "autosave-manager.c"
 }
 
 
 static gchar* value_autosave_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	AutosaveManager** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (!object_p) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3159 "autosave-manager.c"
+#line 2522 "autosave-manager.c"
 	}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (!value->data[0].v_pointer) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = NULL;
-#line 3165 "autosave-manager.c"
+#line 2528 "autosave-manager.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3169 "autosave-manager.c"
+#line 2532 "autosave-manager.c"
 	} else {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = autosave_manager_ref (value->data[0].v_pointer);
-#line 3173 "autosave-manager.c"
+#line 2536 "autosave-manager.c"
 	}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 3177 "autosave-manager.c"
+#line 2540 "autosave-manager.c"
 }
 
 
 GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecAutosaveManager* spec;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_AUTOSAVE_MANAGER), NULL);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return G_PARAM_SPEC (spec);
-#line 3191 "autosave-manager.c"
+#line 2554 "autosave-manager.c"
 }
 
 
 gpointer value_get_autosave_manager (const GValue* value) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER), NULL);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
-#line 3200 "autosave-manager.c"
+#line 2563 "autosave-manager.c"
 }
 
 
 void value_set_autosave_manager (GValue* value, gpointer v_object) {
 	AutosaveManager* old;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	old = value->data[0].v_pointer;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (v_object) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_AUTOSAVE_MANAGER));
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = v_object;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_ref (value->data[0].v_pointer);
-#line 3220 "autosave-manager.c"
+#line 2583 "autosave-manager.c"
 	} else {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 3224 "autosave-manager.c"
+#line 2587 "autosave-manager.c"
 	}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
-#line 3230 "autosave-manager.c"
+#line 2593 "autosave-manager.c"
 	}
 }
 
 
 void value_take_autosave_manager (GValue* value, gpointer v_object) {
 	AutosaveManager* old;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	old = value->data[0].v_pointer;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (v_object) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_AUTOSAVE_MANAGER));
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = v_object;
-#line 3249 "autosave-manager.c"
+#line 2612 "autosave-manager.c"
 	} else {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 3253 "autosave-manager.c"
+#line 2616 "autosave-manager.c"
 	}
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
-#line 3259 "autosave-manager.c"
+#line 2622 "autosave-manager.c"
 	}
 }
 
@@ -3356,86 +2627,60 @@ void value_take_autosave_manager (GValue* value, gpointer v_object) {
 static void autosave_manager_class_init (AutosaveManagerClass * klass) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_ = NULL;
-	pid_t _tmp10_ = 0;
-	gchar* _tmp11_ = NULL;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_parent_class = g_type_class_peek_parent (klass);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	AUTOSAVE_MANAGER_CLASS (klass)->finalize = autosave_manager_finalize;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_type_class_add_private (klass, sizeof (AutosaveManagerPrivate));
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "autosaves", NULL);
-#line 38 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_AUTOSAVE_DIR = _tmp1_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp2_ = g_strdup ("autosaves");
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_AUTOSAVE_NAME = _tmp2_;
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = g_strdup (".db");
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_AUTOSAVE_EXT = _tmp3_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp5_ = autosave_manager_AUTOSAVE_NAME;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = autosave_manager_AUTOSAVE_EXT;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = _tmp7_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp9_ = g_build_filename (_tmp4_, _tmp8_, NULL);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_AUTOSAVE_FILENAME = _tmp9_;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = getpid ();
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp11_ = g_strdup_printf ("%i", (gint) _tmp10_);
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_PID = _tmp11_;
-#line 3317 "autosave-manager.c"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = g_strdup ("autosave.book");
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_AUTOSAVE_FILENAME = _tmp2_;
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = autosave_manager_AUTOSAVE_DIR;
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = autosave_manager_AUTOSAVE_FILENAME;
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = g_build_filename (_tmp3_, _tmp4_, NULL);
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_AUTOSAVE_PATH = _tmp5_;
+#line 2658 "autosave-manager.c"
 }
 
 
 static void autosave_manager_instance_init (AutosaveManager * self) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv = AUTOSAVE_MANAGER_GET_PRIVATE (self);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->_book = NULL;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->cur_book_revision = 0;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->book_ = NULL;
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->ref_count = 1;
-#line 3332 "autosave-manager.c"
+#line 2671 "autosave-manager.c"
 }
 
 
 static void autosave_manager_finalize (AutosaveManager* obj) {
 	AutosaveManager * self;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AUTOSAVE_MANAGER, AutosaveManager);
-#line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_sqlite3_close0 (self->priv->database_connection);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_book_unref0 (self->priv->_book);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_g_hash_table_unref0 (self->priv->dirty_pages);
-#line 3346 "autosave-manager.c"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_hash_table_unref0 (self->priv->page_filenames);
+#line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_book_unref0 (self->priv->book_);
+#line 2683 "autosave-manager.c"
 }
 
 
@@ -3456,25 +2701,55 @@ GType autosave_manager_get_type (void) {
 gpointer autosave_manager_ref (gpointer instance) {
 	AutosaveManager* self;
 	self = instance;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return instance;
-#line 3371 "autosave-manager.c"
+#line 2708 "autosave-manager.c"
 }
 
 
 void autosave_manager_unref (gpointer instance) {
 	AutosaveManager* self;
 	self = instance;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3384 "autosave-manager.c"
+#line 2721 "autosave-manager.c"
+	}
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
 	}
+	return length;
 }
 
 
diff --git a/src/autosave-manager.vala b/src/autosave-manager.vala
index eb8f1c5..a9d3bf4 100644
--- a/src/autosave-manager.vala
+++ b/src/autosave-manager.vala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2011 Timo Kluck
- * Author: Timo Kluck <tkluck@infty.nl>
+ * Authors: Timo Kluck <tkluck@infty.nl>
+ *          Robert Ancell <robert.ancell@canonical.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
@@ -9,545 +10,351 @@
  * license.
  */
 
-/*
- * We store autosaves in a database named
- *    ~/.cache/simple-scan/autosaves/autosaves.db
- * It contains a single table of pages, each containing the process id (pid) of
- * the simple-scan instance that saved it, and a hash of the Book and Page
- * objects corresponding to it. The pixels are saved as a BLOB.
- * Additionally, the autosaves directory contains a number of tiff files that
- * the user can use for manual recovery.
- *
- * At startup, we check whether autosaves.db contains any records
- * with a pid that does not match a current pid for simple-scan. If so, we take
- * ownership by an UPDATE statement changing to our own pid. Then, we
- * recover the book. We're trying our best to avoid the possible race
- * condition if several instances of simple-scan are started simultaneously.
- *
- * At application exit, we delete the records corresponding to our own pid.
- *
- * Important notes:
- *  - We enforce that there is only one AutosaveManager instance in a given
- *    process by using a create function.
- *  - It should be possible to change the book object at runtime, although this
- *    is not used in the current implementation so it has not been tested.
- */
-
 public class AutosaveManager
 {
     private static string AUTOSAVE_DIR = Path.build_filename (Environment.get_user_cache_dir (), "simple-scan", "autosaves");
-    private static string AUTOSAVE_NAME = "autosaves";
-    private static string AUTOSAVE_EXT = ".db";
-    private static string AUTOSAVE_FILENAME = Path.build_filename (AUTOSAVE_DIR, AUTOSAVE_NAME + AUTOSAVE_EXT);
-
-    private static string PID = ((int)(Posix.getpid ())).to_string ();
-    private static int number_of_instances = 0;
-
-    private Sqlite.Database database_connection;
-    private Book _book = null;
+    private static string AUTOSAVE_FILENAME = "autosave.book";
+    private static string AUTOSAVE_PATH = Path.build_filename (AUTOSAVE_DIR, AUTOSAVE_FILENAME);
 
     private uint update_timeout = 0;
-    private HashTable<Page, bool> dirty_pages;
 
+    private HashTable<Page, string> page_filenames;
+
+    private Book book_ = null;
     public Book book
     {
         get
         {
-            return _book;
+            return book_;
         }
         set
         {
-            if (_book != null)
+            if (book_ != null)
             {
-                for (var i = 0; i < _book.get_n_pages (); i++)
+                for (var i = 0; i < book_.n_pages; i++)
                 {
-                    var page = _book.get_page (i);
+                    var page = book_.get_page (i);
                     on_page_removed (page);
                 }
-                _book.page_added.disconnect (on_page_added);
-                _book.page_removed.disconnect (on_page_removed);
-                _book.reordered.disconnect (on_reordered);
-                _book.cleared.disconnect (on_cleared);
+                book_.page_added.disconnect (on_page_added);
+                book_.page_removed.disconnect (on_page_removed);
+                book_.reordered.disconnect (on_changed);
+                book_.cleared.disconnect (on_cleared);
             }
-            _book = value;
-            _book.page_added.connect (on_page_added);
-            _book.page_removed.connect (on_page_removed);
-            _book.reordered.connect (on_reordered);
-            _book.cleared.connect (on_cleared);
-            for (var i = 0; i < _book.get_n_pages (); i++)
+            book_ = value;
+            book_.page_added.connect (on_page_added);
+            book_.page_removed.connect (on_page_removed);
+            book_.reordered.connect (on_changed);
+            book_.cleared.connect (on_cleared);
+            for (var i = 0; i < book_.n_pages; i++)
             {
-                var page = book.get_page (i);
+                var page = book_.get_page (i);
                 on_page_added (page);
             }
         }
     }
 
-    public static AutosaveManager? create (ref Book book)
+    public AutosaveManager ()
+    {
+        page_filenames = new HashTable<Page, string> (direct_hash, direct_equal);
+    }
+
+    public void load ()
     {
-        /* compare autosave directories with pids of current instances of simple-scan
-         * take ownership of one of the ones that are unowned by renaming to the
-         * own pid. Then open the database and fill the book with the pages it
-         * contains.
-         */
-        if (number_of_instances > 0)
-            assert_not_reached ();
+        debug ("Loading autosave information");
 
-        var man = new AutosaveManager ();
-        number_of_instances++;
+        book.clear ();
+        page_filenames.remove_all ();
 
+        var file = new KeyFile ();
         try
         {
-            man.database_connection = open_database_connection ();
+            file.load_from_file (AUTOSAVE_PATH, KeyFileFlags.NONE);
         }
-        catch
+        catch (Error e)
         {
-            warning ("Could not connect to the autosave database; no autosaves will be kept.");
-            return null;
+            warning ("Could not load autosave infomation; not restoring any autosaves");
+            return;
         }
-
-        bool any_pages_recovered = false;
-        try
+        var pages = get_value (file, "simple-scan", "pages");
+        foreach (var page_name in pages.split (" "))
         {
-            // FIXME: this only works on linux. We can maybe use Gtk.Application and some session bus id instead?
-            string current_pids;
-            Process.spawn_command_line_sync ("pidof simple-scan | sed \"s/ /,/g\"", out current_pids);
-            current_pids = current_pids.strip ();
-            Sqlite.Statement stmt;
-            string query = @"
-                   SELECT process_id, book_hash, book_revision FROM pages
-                   WHERE NOT process_id IN ($current_pids)
-                   LIMIT 1
-                ";
-
-            var result = man.database_connection.prepare_v2 (query, -1, out stmt);
-            if (result == Sqlite.OK)
+            debug ("Loading automatically saved page %s", page_name);
+
+            var scan_width = get_integer (file, page_name, "scan-width");
+            var scan_height = get_integer (file, page_name, "scan-height");
+            var rowstride = get_integer (file, page_name, "rowstride");
+            var n_channels = get_integer (file, page_name, "n-channels");
+            var depth = get_integer (file, page_name, "depth");
+            var dpi = get_integer (file, page_name, "dpi");
+            var scan_direction_name = get_value (file, page_name, "scan-direction");
+            ScanDirection scan_direction = ScanDirection.TOP_TO_BOTTOM;
+            switch (scan_direction_name)
             {
-                while (stmt.step () == Sqlite.ROW)
+            case "TOP_TO_BOTTOM":
+                scan_direction = ScanDirection.TOP_TO_BOTTOM;
+                break;
+            case "LEFT_TO_RIGHT":
+                scan_direction = ScanDirection.LEFT_TO_RIGHT;
+                break;
+            case "BOTTOM_TO_TOP":
+                scan_direction = ScanDirection.BOTTOM_TO_TOP;
+                break;
+            case "RIGHT_TO_LEFT":
+                scan_direction = ScanDirection.RIGHT_TO_LEFT;
+                break;
+            }
+            var color_profile = get_value (file, page_name, "color-profile");
+            if (color_profile == "")
+                color_profile = null;
+            var pixels_filename = get_value (file, page_name, "pixels-filename");
+            var has_crop = get_boolean (file, page_name, "has-crop");
+            var crop_name = get_value (file, page_name, "crop-name");
+            if (crop_name == "")
+                crop_name = null;
+            var crop_x = get_integer (file, page_name, "crop-x");
+            var crop_y = get_integer (file, page_name, "crop-y");
+            var crop_width = get_integer (file, page_name, "crop-width");
+            var crop_height = get_integer (file, page_name, "crop-height");
+
+            uchar[]? pixels = null;
+            if (pixels_filename != "")
+            {
+                var path = Path.build_filename (AUTOSAVE_DIR, pixels_filename);
+                var f = File.new_for_path (path);
+                try
+                {
+                    f.load_contents (null, out pixels, null);
+                }
+                catch (Error e)
                 {
-                    debug ("Found at least one autosave page, taking ownership");
-                    var unowned_pid = stmt.column_int (0);
-                    var book_hash = stmt.column_int (1);
-                    var book_revision = stmt.column_int (2);
-                    /* there's a possible race condition here when several instances
-                     * try to take ownership of the same rows. What would happen is
-                     * that this operations would affect no rows if another process
-                     * has taken ownership in the mean time. In that case, recover_book
-                     * does nothing, so there should be no problem.
-                     */
-                    query = @"
-                        UPDATE pages
-                           SET process_id = $PID
-                         WHERE process_id = ?2
-                           AND book_hash = ?3
-                           AND book_revision = ?4";
-                    Sqlite.Statement stmt2;
-                    result = man.database_connection.prepare_v2(query, -1, out stmt2);
-                    if (result != Sqlite.OK)
-                        warning (@"Error preparing statement: $query");
-
-                    stmt2.bind_int64 (2, unowned_pid);
-                    stmt2.bind_int64 (3, book_hash);
-                    stmt2.bind_int64 (4, book_revision);
-                    result = stmt2.step();
-                    if (result == Sqlite.DONE)
-                    {
-                        any_pages_recovered = true;
-                        man.recover_book (ref book);
-                    }
-                    else
-                        warning ("Error %d while executing query", result);
+                    warning ("Failed to load pixel information");
+                    continue;
                 }
             }
-            else
-                warning ("Error %d while preparing statement", result);
+
+            var page = new Page.from_data (scan_width,
+                                           scan_height,
+                                           rowstride,
+                                           n_channels,
+                                           depth,
+                                           dpi,
+                                           scan_direction,
+                                           color_profile,
+                                           pixels,
+                                           has_crop,
+                                           crop_name,
+                                           crop_x,
+                                           crop_y,
+                                           crop_width,
+                                           crop_height);
+            page_filenames.insert (page, pixels_filename);
+            book.append_page (page);
         }
-        catch (SpawnError e)
+    }
+
+    private string get_value (KeyFile file, string group_name, string key, string default = "")
+    {
+        try
         {
-            warning ("Could not obtain current process ids; not restoring any autosaves");
+            return file.get_value (group_name, key);
         }
-
-        man.book = book;
-        if (!any_pages_recovered)
+        catch (Error e)
         {
-            for (var i = 0; i < book.get_n_pages (); i++)
-            {
-                var page = book.get_page (i);
-                man.on_page_added (page);
-            }
+            return default;
         }
+    }
 
-        return man;
+    private int get_integer (KeyFile file, string group_name, string key, int default = 0)
+    {
+        try
+        {
+            return file.get_integer (group_name, key);
+        }
+        catch (Error e)
+        {
+            return default;
+        }
     }
 
-    private AutosaveManager ()
+    private bool get_boolean (KeyFile file, string group_name, string key, bool default = false)
     {
-        dirty_pages = new HashTable<Page, bool> (direct_hash, direct_equal);
+        try
+        {
+            return file.get_boolean (group_name, key);
+        }
+        catch (Error e)
+        {
+            return default;
+        }
     }
 
     public void cleanup ()
     {
-        debug ("Clean exit; deleting autosave records");
+        debug ("Deleting autosave records");
 
         if (update_timeout > 0)
             Source.remove (update_timeout);
         update_timeout = 0;
 
-        warn_if_fail (database_connection.exec (@"
-            DELETE FROM pages
-                WHERE process_id = $PID
-        ") == Sqlite.OK);
-    }
-
-    static Sqlite.Database open_database_connection () throws Error
-    {
-        var autosaves_dir = File.new_for_path (AUTOSAVE_DIR);
+        Dir dir;
         try
         {
-            autosaves_dir.make_directory_with_parents ();
+            dir = Dir.open (AUTOSAVE_DIR);
         }
-        catch
-        { // the directory already exists
-            // pass
+        catch (Error e)
+        {
+            warning ("Failed to delete autosaves: %s", e.message);
+            return;
+        }
+
+        while (true)
+        {
+            var filename = dir.read_name ();
+            if (filename == null)
+                break;
+            var path = Path.build_filename (AUTOSAVE_DIR, filename);
+            FileUtils.unlink (path);
         }
-        Sqlite.Database connection;
-        if (Sqlite.Database.open (AUTOSAVE_FILENAME, out connection) != Sqlite.OK)
-            throw new IOError.FAILED ("Could not connect to autosave database");
-        string query = @"
-            CREATE TABLE IF NOT EXISTS pages (
-                id integer PRIMARY KEY,
-                process_id integer,
-                page_hash integer,
-                book_hash integer,
-                book_revision integer,
-                page_number integer,
-                dpi integer,
-                width integer,
-                height integer,
-                depth integer,
-                n_channels integer,
-                rowstride integer,
-                color_profile string,
-                crop_x integer,
-                crop_y integer,
-                crop_width integer,
-                crop_height integer,
-                scan_direction integer,
-                pixels binary
-            )";
-        var result = connection.exec(query);
-        if (result != Sqlite.OK)
-            warning ("Error %d while executing query", result);
-        return connection;
     }
 
-    void on_page_added (Page page)
+    public void on_page_added (Page page)
     {
-        insert_page (page);
-        // TODO: save a tiff file
-        page.size_changed.connect (on_page_changed);
-        page.scan_direction_changed.connect (on_page_changed);
-        page.crop_changed.connect (on_page_changed);
-        page.scan_finished.connect (on_page_changed);
+        page.scan_finished.connect (on_scan_finished);
+        page.crop_changed.connect (on_changed);
     }
 
     public void on_page_removed (Page page)
     {
-        page.pixels_changed.disconnect (on_page_changed);
-        page.size_changed.disconnect (on_page_changed);
-        page.scan_direction_changed.disconnect (on_page_changed);
-        page.crop_changed.disconnect (on_page_changed);
-        page.scan_finished.connect (on_page_changed);
-
-        string query = @"
-        DELETE FROM pages
-            WHERE process_id = $PID
-              AND page_hash = ?2
-              AND book_hash = ?3
-              AND book_revision = ?4
-        ";
-        Sqlite.Statement stmt;
-        var result = database_connection.prepare_v2 (query, -1, out stmt);
-        if (result != Sqlite.OK)
-            warning (@"Error $result while preparing query");
-        stmt.bind_int64 (2, direct_hash (page));
-        stmt.bind_int64 (3, direct_hash (book));
-        stmt.bind_int64 (4, cur_book_revision);
-
-        result = stmt.step();
-        if (result != Sqlite.DONE)
-            warning ("Error %d while executing query", result);
-    }
+        page.scan_finished.disconnect (on_scan_finished);
+        page.crop_changed.disconnect (on_changed);
 
-    public void on_reordered ()
-    {
-        for (var i=0; i < book.get_n_pages (); i++)
-        {
-            var page = book.get_page (i);
-            string query = @"
-            UPDATE pages SET page_number = ?5
-            WHERE process_id = $PID
-              AND page_hash = ?2
-              AND book_hash = ?3
-              AND book_revision = ?4
-            ";
-            Sqlite.Statement stmt;
-            var result = database_connection.prepare_v2 (query, -1, out stmt);
-            if (result != Sqlite.OK)
-                warning (@"Error $result while preparing query");
-
-            stmt.bind_int64 (5, i);
-            stmt.bind_int64 (2, direct_hash (page));
-            stmt.bind_int64 (3, direct_hash (book));
-            stmt.bind_int64 (4, cur_book_revision);
-
-            result = stmt.step();
-            if (result != Sqlite.DONE)
-                warning ("Error %d while executing query", result);
-        }
+        var filename = page_filenames.lookup (page);
+        if (filename != null)
+            FileUtils.unlink (filename);
+        page_filenames.remove (page);
     }
 
-    public void on_page_changed (Page page)
+    public void on_scan_finished (Page page)
     {
-        update_page (page);
+        save_pixels (page);
+        save (false);
     }
 
-    public void on_needs_saving_changed (Book book)
+    public void on_changed ()
     {
-        for (var n = 0; n < book.get_n_pages (); n++)
-        {
-            var page = book.get_page (n);
-            update_page (page);
-        }
+        save ();
     }
 
-    private int cur_book_revision = 0;
-
     public void on_cleared ()
     {
-        cur_book_revision++;
+        page_filenames.remove_all ();
+        save ();
     }
 
-    private void insert_page (Page page)
+    private void save (bool do_timeout = true)
     {
-        debug ("Adding an autosave for a new page");
-        string query = @"
-            INSERT INTO pages
-                (process_id,
-                page_hash,
-                book_hash,
-                book_revision)
-                VALUES
-                ($PID,
-                ?2,
-                ?3,
-                ?4)
-        ";
-        Sqlite.Statement stmt;
-        var result = database_connection.prepare_v2 (query, -1, out stmt);
-        if (result != Sqlite.OK)
-            warning (@"Error $result while preparing query");
-
-        stmt.bind_int64 (2, direct_hash (page));
-        stmt.bind_int64 (3, direct_hash (book));
-        stmt.bind_int64 (4, cur_book_revision);
-
-        result = stmt.step();
-        if (result != Sqlite.DONE)
-            warning ("Error %d while executing query", result);
-
-        update_page (page);
-    }
+        if (update_timeout == 0 && do_timeout)
+            debug ("Waiting to autosave...");
 
-    private void update_page (Page page)
-    {
-        dirty_pages.insert (page, true);
+        /* Cancel existing timeout */
         if (update_timeout > 0)
             Source.remove (update_timeout);
-        update_timeout = Timeout.add (100, () =>
-        {
-            var iter = HashTableIter<Page, bool> (dirty_pages);
-            Page p;
-            bool is_dirty;
-            while (iter.next (out p, out is_dirty))
-                real_update_page (p);
-
-            dirty_pages.remove_all ();
-            update_timeout = 0;
-
-            return false;
-        });
-    }
-
-    private void real_update_page (Page page)
-    {
-        debug ("Updating the autosave for a page");
-
-        int crop_x;
-        int crop_y;
-        int crop_width;
-        int crop_height;
-        page.get_crop (out crop_x, out crop_y, out crop_width, out crop_height);
-
-        Sqlite.Statement stmt;
-        string query = @"
-            UPDATE pages
-                SET
-                page_number=$(book.get_page_index (page)),
-                dpi=$(page.get_dpi ()),
-                width=$(page.get_width ()),
-                height=$(page.get_height ()),
-                depth=$(page.get_depth ()),
-                n_channels=$(page.get_n_channels ()),
-                rowstride=$(page.get_rowstride ()),
-                crop_x=$crop_x,
-                crop_y=$crop_y,
-                crop_width=$crop_width,
-                crop_height=$crop_height,
-                scan_direction=$((int)page.get_scan_direction ()),
-                color_profile=?1,
-                pixels=?2
-                WHERE process_id = $PID
-                  AND page_hash = ?4
-                  AND book_hash = ?5
-                  AND book_revision = ?6
-            ";
-
-        var result = database_connection.prepare_v2 (query, -1, out stmt);
-        if (result != Sqlite.OK)
-        {
-            warning ("Error %d while preparing statement", result);
-            return;
-        }
-
-        stmt.bind_int64 (4, direct_hash (page));
-        stmt.bind_int64 (5, direct_hash (book));
-        stmt.bind_int64 (6, cur_book_revision);
-        result = stmt.bind_text (1, page.get_color_profile () ?? "");
-
-        if (result != Sqlite.OK)
-            warning ("Error %d while binding text", result);
+        update_timeout = 0;
 
-        if (page.get_pixels () != null)
+        if (do_timeout)
         {
-            // (-1) is the special value SQLITE_TRANSIENT
-            result = stmt.bind_blob (2, page.get_pixels (), page.get_pixels ().length, (DestroyNotify)(-1));
-            if (result != Sqlite.OK)
-                warning ("Error %d while binding blob", result);
+            update_timeout = Timeout.add (100, () =>
+            {
+                real_save ();
+                update_timeout = 0;
+                return false;
+            });
         }
         else
-            warn_if_fail (stmt.bind_null (2) == Sqlite.OK);
-
-        warn_if_fail (stmt.step () == Sqlite.DONE);
+            real_save();
     }
 
-    private void recover_book (ref Book book)
+    private void real_save ()
     {
-        Sqlite.Statement stmt;
-        string query = @"
-            SELECT process_id,
-                page_hash,
-                book_hash,
-                book_revision,
-                page_number,
-                dpi,
-                width,
-                height,
-                depth,
-                n_channels,
-                rowstride,
-                color_profile,
-                crop_x,
-                crop_y,
-                crop_width,
-                crop_height,
-                scan_direction,
-                pixels,
-                id
-            FROM pages
-            WHERE process_id = $PID
-              AND book_revision = (
-                  SELECT MAX(book_revision) FROM pages WHERE process_id = $PID
-              )
-            ORDER BY page_number
-        ";
-
-        var result = database_connection.prepare_v2 (query, -1, out stmt);
-        if (result != Sqlite.OK)
-            warning ("Error %d while preparing statement", result);
-
-        var first = true;
-        while (Sqlite.ROW == stmt.step ())
+        debug ("Autosaving book information");
+
+        var file = new KeyFile ();
+        var page_names = "";
+        for (var i = 0; i < book.n_pages; i++)
         {
-            debug ("Found a page that needs to be recovered");
-            if (first)
-            {
-                book.clear ();
-                first = false;
-            }
-            var dpi = stmt.column_int (5);
-            var width = stmt.column_int (6);
-            var height = stmt.column_int (7);
-            var depth = stmt.column_int (8);
-            var n_channels = stmt.column_int (9);
-            var scan_direction = (ScanDirection)stmt.column_int (16);
-
-            if (width <= 0 || height <= 0)
+            var page = book.get_page (i);
+
+            /* Skip empty pages */
+            if (!page.has_data)
                 continue;
 
-            debug (@"Restoring a page of size $(width) x $(height)");
-            var new_page = book.append_page (width, height, dpi, scan_direction);
+            var page_name = "page-%d".printf (i);
+            if (page_names != "")
+                page_names += " ";
+            page_names += page_name;
 
-            if (depth > 0 && n_channels > 0)
-            {
-                var info = new ScanPageInfo ();
-                info.width = width;
-                info.height = height;
-                info.depth = depth;
-                info.n_channels = n_channels;
-                info.dpi = dpi;
-                info.device = "";
-                new_page.set_page_info (info);
-            }
+            debug ("Autosaving page %s", page_name);
 
-            new_page.set_color_profile (stmt.column_text (11));
-            var crop_x = stmt.column_int (12);
-            var crop_y = stmt.column_int (13);
-            var crop_width = stmt.column_int (14);
-            var crop_height = stmt.column_int (15);
-            if (crop_width > 0 && crop_height > 0)
+            file.set_integer (page_name, "scan-width", page.scan_width);
+            file.set_integer (page_name, "scan-height", page.scan_height);
+            file.set_integer (page_name, "rowstride", page.rowstride);
+            file.set_integer (page_name, "n-channels", page.n_channels);
+            file.set_integer (page_name, "depth", page.depth);
+            file.set_integer (page_name, "dpi", page.dpi);
+            switch (page.scan_direction)
             {
-                new_page.set_custom_crop (crop_width, crop_height);
-                new_page.move_crop (crop_x, crop_y);
+            case ScanDirection.TOP_TO_BOTTOM:
+                file.set_value (page_name, "scan-direction", "TOP_TO_BOTTOM");
+                break;
+            case ScanDirection.LEFT_TO_RIGHT:
+                file.set_value (page_name, "scan-direction", "LEFT_TO_RIGHT");
+                break;
+            case ScanDirection.BOTTOM_TO_TOP:
+                file.set_value (page_name, "scan-direction", "BOTTOM_TO_TOP");
+                break;
+            case ScanDirection.RIGHT_TO_LEFT:
+                file.set_value (page_name, "scan-direction", "RIGHT_TO_LEFT");
+                break;
             }
-
-            uchar[] new_pixels = new uchar[stmt.column_bytes (17)];
-            Memory.copy (new_pixels, stmt.column_blob (17), stmt.column_bytes (17));
-            new_page.set_pixels (new_pixels);
-
-            var id = stmt.column_int (18);
-            debug ("Updating autosave to point to our new copy of the page");
-            query = @"
-                UPDATE pages
-                   SET page_hash=?1,
-                       book_hash=?2,
-                       book_revision=?3
-                WHERE id = $id
-            ";
-
-            Sqlite.Statement stmt2;
-            var result2 = database_connection.prepare_v2 (query, -1, out stmt2);
-            if (result2 != Sqlite.OK)
-                warning (@"Error $result2 while preparing query");
-            stmt2.bind_int64 (1, direct_hash (new_page));
-            stmt2.bind_int64 (2, direct_hash (book));
-            stmt2.bind_int64 (3, cur_book_revision);
-
-            result2 = stmt2.step ();
-            if (result2 != Sqlite.DONE)
-                warning ("Error %d while executing query", result);
+            file.set_value (page_name, "color-profile", page.color_profile ?? "");
+            file.set_value (page_name, "pixels-filename", page_filenames.lookup (page) ?? "");
+            file.set_boolean (page_name, "has-crop", page.has_crop);
+            file.set_value (page_name, "crop-name", page.crop_name ?? "");
+            file.set_integer (page_name, "crop-x", page.crop_x);
+            file.set_integer (page_name, "crop-y", page.crop_y);
+            file.set_integer (page_name, "crop-width", page.crop_width);
+            file.set_integer (page_name, "crop-height", page.crop_height);
+        }
+        file.set_value ("simple-scan", "pages", page_names);
+ 
+        try
+        {
+            DirUtils.create_with_parents (AUTOSAVE_DIR, 0777);
+            FileUtils.set_contents (AUTOSAVE_PATH, file.to_data ());
         }
+        catch (Error e)
+        {
+            warning ("Failed to write autosave: %s", e.message);
+        }
+    }
+
+    private void save_pixels (Page page)
+    {
+        var filename = "%u.pixels".printf (direct_hash (page));
+        var path = Path.build_filename (AUTOSAVE_DIR, filename);
+        page_filenames.insert (page, filename);
+
+        debug ("Autosaving page pixels to %s", path);
 
-        if (first)
-            debug ("No pages found to recover");
+        var file = File.new_for_path (path);
+        try
+        {
+            file.replace_contents (page.get_pixels (), null, false, FileCreateFlags.NONE, null);
+        }
+        catch (Error e)
+        {
+            warning ("Failed to autosave page contents: %s", e.message);
+        }
     }
 }
diff --git a/src/book-view.c b/src/book-view.c
index 0169a0a..d6cfdc9 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.20.1, the Vala compiler
+/* book-view.c generated by valac 0.22.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
@@ -70,21 +70,21 @@ typedef struct _PageViewClass PageViewClass;
 #define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
 
 struct _BookView {
-	GtkVBox parent_instance;
+	GtkBox parent_instance;
 	BookViewPrivate * priv;
 };
 
 struct _BookViewClass {
-	GtkVBoxClass parent_class;
+	GtkBoxClass parent_class;
 };
 
 struct _BookViewPrivate {
-	Book* book;
+	Book* _book;
 	GHashTable* page_data;
 	gboolean need_layout;
 	gboolean laying_out;
 	gboolean show_selected_page;
-	PageView* selected_page;
+	PageView* selected_page_view;
 	GtkWidget* drawing_area;
 	GtkScrollbar* scroll;
 	GtkAdjustment* adjustment;
@@ -118,8 +118,12 @@ gpointer value_get_page_view (const GValue* value);
 GType page_view_get_type (void) G_GNUC_CONST;
 #define BOOK_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BOOK_VIEW, BookViewPrivate))
 enum  {
-	BOOK_VIEW_DUMMY_PROPERTY
+	BOOK_VIEW_DUMMY_PROPERTY,
+	BOOK_VIEW_BOOK,
+	BOOK_VIEW_SELECTED_PAGE,
+	BOOK_VIEW_X_OFFSET
 };
+Book* book_view_get_book (BookView* self);
 static void book_view_add_cb (BookView* self, Book* book, Page* page);
 static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self);
 static void book_view_remove_cb (BookView* self, Book* book, Page* page);
@@ -146,9 +150,10 @@ static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment);
 static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 BookView* book_view_new (Book* book);
 BookView* book_view_construct (GType object_type, Book* book);
+static void book_view_set_book (BookView* self, Book* value);
 guint book_get_n_pages (Book* self);
 Page* book_get_page (Book* self, gint page_number);
-void book_view_select_page (BookView* self, Page* page);
+void book_view_set_selected_page (BookView* self, Page* value);
 static void _page_unref0_ (gpointer var);
 static void _page_view_unref0_ (gpointer var);
 static PageView* book_view_get_nth_page (BookView* self, gint n);
@@ -162,16 +167,15 @@ PageView* page_view_new (Page* page);
 PageView* page_view_construct (GType object_type, Page* page);
 static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self);
 static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self);
-static void book_view_set_selected_page (BookView* self, PageView* page);
-void page_view_set_selected (PageView* self, gboolean selected);
-static void book_view_set_x_offset (BookView* self, gint offset);
-static gint book_view_get_x_offset (BookView* self);
+static void book_view_set_selected_page_view (BookView* self, PageView* page);
+void page_view_set_selected (PageView* self, gboolean value);
 static void book_view_show_page_view (BookView* self, PageView* page);
 gint page_view_get_x_offset (PageView* self);
 gint page_view_get_width (PageView* self);
+gint book_view_get_x_offset (BookView* self);
+void book_view_set_x_offset (BookView* self, gint value);
 static void book_view_select_page_view (BookView* self, PageView* page);
-Page* book_view_get_selected (BookView* self);
-Book* book_view_get_book (BookView* self);
+Page* book_view_get_selected_page (BookView* self);
 static void book_view_layout_into (BookView* self, gint width, gint height, gint* book_width, gint* book_height);
 gint page_get_dpi (Page* self);
 gint page_get_width (Page* self);
@@ -179,8 +183,8 @@ gint page_get_height (Page* self);
 void page_view_set_width (PageView* self, gint width);
 void page_view_set_height (PageView* self, gint height);
 gint page_view_get_height (PageView* self);
-void page_view_set_x_offset (PageView* self, gint offset);
-void page_view_set_y_offset (PageView* self, gint offset);
+void page_view_set_x_offset (PageView* self, gint value);
+void page_view_set_y_offset (PageView* self, gint value);
 static void book_view_layout (BookView* self);
 void page_view_render (PageView* self, cairo_t* context);
 gboolean page_view_get_selected (PageView* self);
@@ -195,2127 +199,2123 @@ void book_view_select_next_page (BookView* self);
 void book_view_select_prev_page (BookView* self);
 static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void book_view_finalize (GObject* obj);
+static void _vala_book_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_book_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 
 
 static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_add_cb (self, _sender, page);
-#line 204 "book-view.c"
+#line 210 "book-view.c"
 }
 
 
 static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_remove_cb (self, _sender, page);
-#line 211 "book-view.c"
+#line 217 "book-view.c"
 }
 
 
 static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_reorder_cb (self, _sender);
-#line 218 "book-view.c"
+#line 224 "book-view.c"
 }
 
 
 static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) {
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_clear_cb (self, _sender);
-#line 225 "book-view.c"
+#line 231 "book-view.c"
 }
 
 
 static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
 	gboolean result;
 	result = book_view_configure_cb (self, _sender, event);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 234 "book-view.c"
+#line 240 "book-view.c"
 }
 
 
 static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
 	result = book_view_draw_cb (self, _sender, cr);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 243 "book-view.c"
+#line 249 "book-view.c"
 }
 
 
 static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
 	gboolean result;
 	result = book_view_motion_cb (self, _sender, event);
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 252 "book-view.c"
+#line 258 "book-view.c"
 }
 
 
 static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = book_view_key_cb (self, _sender, event);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 261 "book-view.c"
+#line 267 "book-view.c"
 }
 
 
 static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = book_view_button_cb (self, _sender, event);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 270 "book-view.c"
+#line 276 "book-view.c"
 }
 
 
 static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = book_view_button_cb (self, _sender, event);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 279 "book-view.c"
+#line 285 "book-view.c"
 }
 
 
 static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = book_view_focus_cb (self, _sender, event);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 288 "book-view.c"
+#line 294 "book-view.c"
 }
 
 
 static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = book_view_focus_cb (self, _sender, event);
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 297 "book-view.c"
+#line 303 "book-view.c"
 }
 
 
 static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_scroll_cb (self, _sender);
-#line 304 "book-view.c"
-}
-
-
-static gpointer _book_ref0 (gpointer self) {
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return self ? book_ref (self) : NULL;
-#line 311 "book-view.c"
+#line 310 "book-view.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
-#line 318 "book-view.c"
+#line 317 "book-view.c"
 }
 
 
 static void _page_view_unref0_ (gpointer var) {
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	(var == NULL) ? NULL : (var = (page_view_unref (var), NULL));
-#line 325 "book-view.c"
+#line 324 "book-view.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 332 "book-view.c"
+#line 331 "book-view.c"
 }
 
 
 BookView* book_view_construct (GType object_type, Book* book) {
 	BookView * self = NULL;
-	Book* _tmp0_;
-	Book* _tmp1_;
-	Book* _tmp13_;
+	Book* _tmp0_ = NULL;
+	Book* _tmp13_ = NULL;
 	Page* _tmp14_ = NULL;
-	Page* _tmp15_;
-	Book* _tmp16_;
-	Book* _tmp17_;
-	Book* _tmp18_;
-	Book* _tmp19_;
-	GHashFunc _tmp20_;
-	GEqualFunc _tmp21_;
-	GHashTable* _tmp22_;
-	GtkDrawingArea* _tmp23_;
-	GtkWidget* _tmp24_;
-	GtkWidget* _tmp25_;
-	GtkWidget* _tmp26_;
-	GtkWidget* _tmp27_;
-	GtkScrollbar* _tmp28_;
-	GtkScrollbar* _tmp29_;
+	Page* _tmp15_ = NULL;
+	Book* _tmp16_ = NULL;
+	Book* _tmp17_ = NULL;
+	Book* _tmp18_ = NULL;
+	Book* _tmp19_ = NULL;
+	GHashFunc _tmp20_ = NULL;
+	GEqualFunc _tmp21_ = NULL;
+	GHashTable* _tmp22_ = NULL;
+	GtkDrawingArea* _tmp23_ = NULL;
+	GtkWidget* _tmp24_ = NULL;
+	GtkWidget* _tmp25_ = NULL;
+	GtkWidget* _tmp26_ = NULL;
+	GtkWidget* _tmp27_ = NULL;
+	GtkScrollbar* _tmp28_ = NULL;
+	GtkScrollbar* _tmp29_ = NULL;
 	GtkAdjustment* _tmp30_ = NULL;
-	GtkAdjustment* _tmp31_;
-	GtkScrollbar* _tmp32_;
-	GtkWidget* _tmp33_;
-	GtkWidget* _tmp34_;
-	GtkWidget* _tmp35_;
-	GtkWidget* _tmp36_;
-	GtkWidget* _tmp37_;
-	GtkWidget* _tmp38_;
-	GtkWidget* _tmp39_;
-	GtkWidget* _tmp40_;
-	GtkAdjustment* _tmp41_;
-	GtkWidget* _tmp42_;
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GtkAdjustment* _tmp31_ = NULL;
+	GtkScrollbar* _tmp32_ = NULL;
+	GtkWidget* _tmp33_ = NULL;
+	GtkWidget* _tmp34_ = NULL;
+	GtkWidget* _tmp35_ = NULL;
+	GtkWidget* _tmp36_ = NULL;
+	GtkWidget* _tmp37_ = NULL;
+	GtkWidget* _tmp38_ = NULL;
+	GtkWidget* _tmp39_ = NULL;
+	GtkWidget* _tmp40_ = NULL;
+	GtkAdjustment* _tmp41_ = NULL;
+	GtkWidget* _tmp42_ = NULL;
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (book != NULL, NULL);
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self = (BookView*) g_object_new (object_type, NULL);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	self = (BookView*) g_object_new (object_type, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = book;
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _book_ref0 (_tmp0_);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_book_unref0 (self->priv->book);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->book = _tmp1_;
-#line 382 "book-view.c"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	book_view_set_book (self, _tmp0_);
+#line 376 "book-view.c"
 	{
-		gint i;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 387 "book-view.c"
+#line 381 "book-view.c"
 		{
-			gboolean _tmp2_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp2_ = TRUE;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp1_ = FALSE;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp1_ = TRUE;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 394 "book-view.c"
-				gboolean _tmp3_;
-				gint _tmp5_;
-				Book* _tmp6_;
+#line 388 "book-view.c"
+				gboolean _tmp2_ = FALSE;
+				gint _tmp4_ = 0;
+				Book* _tmp5_ = NULL;
+				guint _tmp6_ = 0U;
 				guint _tmp7_ = 0U;
-				Book* _tmp8_;
-				gint _tmp9_;
+				Page* page = NULL;
+				Book* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
 				Page* _tmp10_ = NULL;
-				Page* page;
-				Book* _tmp11_;
-				Page* _tmp12_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = _tmp2_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp3_) {
-#line 409 "book-view.c"
-					gint _tmp4_;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp4_ = i;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp4_ + 1;
-#line 415 "book-view.c"
+				Book* _tmp11_ = NULL;
+				Page* _tmp12_ = NULL;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp2_ = _tmp1_;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!_tmp2_) {
+#line 404 "book-view.c"
+					gint _tmp3_ = 0;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp3_ = i;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					i = _tmp3_ + 1;
+#line 410 "book-view.c"
 				}
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp2_ = FALSE;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = i;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = book;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = book_get_n_pages (_tmp6_);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp5_) < _tmp7_)) {
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp1_ = FALSE;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp4_ = i;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp5_ = book;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp6_ = book_get_n_pages (_tmp5_);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp7_ = _tmp6_;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp4_) < _tmp7_)) {
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 429 "book-view.c"
+#line 426 "book-view.c"
 				}
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = book;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = i;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = book_get_page (_tmp8_, _tmp9_);
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp10_;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = book;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = page;
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				book_view_add_cb (self, _tmp11_, _tmp12_);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
-#line 447 "book-view.c"
+#line 444 "book-view.c"
 			}
 		}
 	}
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = book;
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = book_get_page (_tmp13_, 0);
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = _tmp14_;
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_select_page (self, _tmp15_);
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	book_view_set_selected_page (self, _tmp15_);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (_tmp15_);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = book;
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp16_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp17_ = book;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp17_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0);
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = book;
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp18_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = book;
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp19_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0);
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = g_direct_hash;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = g_direct_equal;
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = g_hash_table_new_full (_tmp20_, _tmp21_, _page_unref0_, _page_view_unref0_);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->page_data = _tmp22_;
-#line 63 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = GDK_ARROW;
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp23_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_ref_sink (_tmp23_);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->drawing_area = (GtkWidget*) _tmp23_;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->drawing_area;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_size_request (_tmp24_, 200, 100);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp25_ = self->priv->drawing_area;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_can_focus (_tmp25_, TRUE);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp26_ = self->priv->drawing_area;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_events (_tmp26_, (gint) (((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK));
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp27_ = self->priv->drawing_area;
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_box_pack_start ((GtkBox*) self, _tmp27_, TRUE, TRUE, (guint) 0);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp28_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_ref_sink (_tmp28_);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->scroll = _tmp28_;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp29_ = self->priv->scroll;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp30_ = gtk_range_get_adjustment ((GtkRange*) _tmp29_);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->adjustment);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->adjustment = _tmp31_;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp32_ = self->priv->scroll;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp32_, FALSE, TRUE, (guint) 0);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp33_ = self->priv->drawing_area;
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp33_, "configure-event", (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self, 0);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp34_ = self->priv->drawing_area;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp34_, "draw", (GCallback) _book_view_draw_cb_gtk_widget_draw, self, 0);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp35_ = self->priv->drawing_area;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp35_, "motion-notify-event", (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self, 0);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp36_ = self->priv->drawing_area;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp36_, "key-press-event", (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self, 0);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp37_ = self->priv->drawing_area;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp37_, "button-press-event", (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self, 0);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp38_ = self->priv->drawing_area;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp38_, "button-release-event", (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self, 0);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp39_ = self->priv->drawing_area;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp39_, "focus-in-event", (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self, G_CONNECT_AFTER);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp40_ = self->priv->drawing_area;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp40_, "focus-out-event", (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self, G_CONNECT_AFTER);
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp41_ = self->priv->adjustment;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp41_, "value-changed", (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self, 0);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp42_ = self->priv->drawing_area;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_show (_tmp42_);
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self;
-#line 579 "book-view.c"
+#line 576 "book-view.c"
 }
 
 
 BookView* book_view_new (Book* book) {
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return book_view_construct (TYPE_BOOK_VIEW, book);
-#line 586 "book-view.c"
+#line 583 "book-view.c"
 }
 
 
 static gpointer _page_view_ref0 (gpointer self) {
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_view_ref (self) : NULL;
-#line 593 "book-view.c"
+#line 590 "book-view.c"
 }
 
 
 static PageView* book_view_get_nth_page (BookView* self, gint n) {
 	PageView* result = NULL;
-	Book* _tmp0_;
-	gint _tmp1_;
+	Page* page = NULL;
+	Book* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
 	Page* _tmp2_ = NULL;
-	Page* page;
-	GHashTable* _tmp3_;
+	GHashTable* _tmp3_ = NULL;
 	gconstpointer _tmp4_ = NULL;
-	PageView* _tmp5_;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* _tmp5_ = NULL;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->book;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->_book;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = n;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = book_get_page (_tmp0_, _tmp1_);
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page = _tmp2_;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = self->priv->page_data;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = g_hash_table_lookup (_tmp3_, page);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _page_view_ref0 ((PageView*) _tmp4_);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp5_;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (page);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 628 "book-view.c"
+#line 625 "book-view.c"
 }
 
 
 static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 	PageView* result = NULL;
-	PageView* _tmp20_;
-	PageView* _tmp21_;
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* _tmp19_ = NULL;
+	PageView* _tmp20_ = NULL;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
-#line 640 "book-view.c"
+#line 637 "book-view.c"
 	{
-		gint i;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 645 "book-view.c"
+#line 642 "book-view.c"
 		{
-			gboolean _tmp0_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp0_ = FALSE;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 652 "book-view.c"
-				gboolean _tmp1_;
-				Book* _tmp3_;
-				gint _tmp4_;
+#line 649 "book-view.c"
+				gboolean _tmp1_ = FALSE;
+				Page* p = NULL;
+				Book* _tmp3_ = NULL;
+				gint _tmp4_ = 0;
 				Page* _tmp5_ = NULL;
-				Page* p;
-				Page* _tmp6_;
-				Page* _tmp7_;
-				PageView* _tmp8_;
+				Page* _tmp6_ = NULL;
+				Page* _tmp7_ = NULL;
+				PageView* _tmp8_ = NULL;
 				Page* _tmp9_ = NULL;
-				Page* _tmp10_;
-				gboolean _tmp11_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				Page* _tmp10_ = NULL;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = _tmp0_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp1_) {
-#line 668 "book-view.c"
-					gint _tmp2_;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 664 "book-view.c"
+					gint _tmp2_ = 0;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp2_ = i;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp2_ + 1;
-#line 674 "book-view.c"
+#line 670 "book-view.c"
 				}
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = self->priv->book;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp3_ = self->priv->_book;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = i;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp5_;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = p;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp6_ == NULL) {
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 694 "book-view.c"
+#line 690 "book-view.c"
 				}
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = p;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = page;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page_view_get_page (_tmp8_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = _tmp9_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = _tmp7_ == _tmp10_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (_tmp10_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp11_) {
-#line 710 "book-view.c"
-					Book* _tmp12_;
-					gint _tmp13_;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp7_ == _tmp10_) {
+#line 702 "book-view.c"
+					Book* _tmp11_ = NULL;
+					gint _tmp12_ = 0;
+					Page* _tmp13_ = NULL;
 					Page* _tmp14_ = NULL;
-					Page* _tmp15_;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp12_ = self->priv->book;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp13_ = i;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp14_ = book_get_page (_tmp12_, _tmp13_ + 1);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp11_ = self->priv->_book;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp12_ = i;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp13_ = book_get_page (_tmp11_, _tmp12_ + 1);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					p = _tmp14_;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp15_ = p;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					if (_tmp15_ != NULL) {
-#line 729 "book-view.c"
-						GHashTable* _tmp16_;
-						Page* _tmp17_;
-						gconstpointer _tmp18_ = NULL;
-						PageView* _tmp19_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp16_ = self->priv->page_data;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp17_ = p;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp18_ = g_hash_table_lookup (_tmp16_, _tmp17_);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp19_ = _page_view_ref0 ((PageView*) _tmp18_);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						result = _tmp19_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					p = _tmp13_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp14_ = p;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					if (_tmp14_ != NULL) {
+#line 721 "book-view.c"
+						GHashTable* _tmp15_ = NULL;
+						Page* _tmp16_ = NULL;
+						gconstpointer _tmp17_ = NULL;
+						PageView* _tmp18_ = NULL;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+						_tmp15_ = self->priv->page_data;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+						_tmp16_ = p;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+						_tmp17_ = g_hash_table_lookup (_tmp15_, _tmp16_);
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+						_tmp18_ = _page_view_ref0 ((PageView*) _tmp17_);
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+						result = _tmp18_;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_page_unref0 (p);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						return result;
-#line 748 "book-view.c"
+#line 740 "book-view.c"
 					}
 				}
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
-#line 753 "book-view.c"
+#line 745 "book-view.c"
 			}
 		}
 	}
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = page;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp21_ = _page_view_ref0 (_tmp20_);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp21_;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp19_ = page;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp20_ = _page_view_ref0 (_tmp19_);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	result = _tmp20_;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 765 "book-view.c"
+#line 757 "book-view.c"
 }
 
 
 static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 	PageView* result = NULL;
-	PageView* _tmp0_;
-	PageView* _tmp1_;
-	PageView* prev_page;
-	PageView* _tmp18_;
-	PageView* _tmp19_;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* prev_page = NULL;
+	PageView* _tmp0_ = NULL;
+	PageView* _tmp1_ = NULL;
+	PageView* _tmp17_ = NULL;
+	PageView* _tmp18_ = NULL;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = page;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _page_view_ref0 (_tmp0_);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	prev_page = _tmp1_;
-#line 786 "book-view.c"
+#line 778 "book-view.c"
 	{
-		gint i;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 791 "book-view.c"
+#line 783 "book-view.c"
 		{
-			gboolean _tmp2_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp2_ = FALSE;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = TRUE;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 798 "book-view.c"
-				gboolean _tmp3_;
-				Book* _tmp5_;
-				gint _tmp6_;
+#line 790 "book-view.c"
+				gboolean _tmp3_ = FALSE;
+				Page* p = NULL;
+				Book* _tmp5_ = NULL;
+				gint _tmp6_ = 0;
 				Page* _tmp7_ = NULL;
-				Page* p;
-				Page* _tmp8_;
-				Page* _tmp9_;
-				PageView* _tmp10_;
+				Page* _tmp8_ = NULL;
+				Page* _tmp9_ = NULL;
+				PageView* _tmp10_ = NULL;
 				Page* _tmp11_ = NULL;
-				Page* _tmp12_;
-				gboolean _tmp13_;
-				GHashTable* _tmp14_;
-				Page* _tmp15_;
-				gconstpointer _tmp16_ = NULL;
-				PageView* _tmp17_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				Page* _tmp12_ = NULL;
+				GHashTable* _tmp13_ = NULL;
+				Page* _tmp14_ = NULL;
+				gconstpointer _tmp15_ = NULL;
+				PageView* _tmp16_ = NULL;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = _tmp2_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp3_) {
-#line 818 "book-view.c"
-					gint _tmp4_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 809 "book-view.c"
+					gint _tmp4_ = 0;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp4_ = i;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp4_ + 1;
-#line 824 "book-view.c"
+#line 815 "book-view.c"
 				}
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = FALSE;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = self->priv->book;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp5_ = self->priv->_book;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = i;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = book_get_page (_tmp5_, _tmp6_);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp7_;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = p;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp8_ == NULL) {
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 844 "book-view.c"
+#line 835 "book-view.c"
 				}
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = p;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = page_view_get_page (_tmp10_);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = _tmp11_;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = _tmp9_ == _tmp12_;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (_tmp12_);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp13_) {
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp9_ == _tmp12_) {
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = prev_page;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
-#line 866 "book-view.c"
+#line 853 "book-view.c"
 				}
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = self->priv->page_data;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = p;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = g_hash_table_lookup (_tmp14_, _tmp15_);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = _page_view_ref0 ((PageView*) _tmp16_);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp13_ = self->priv->page_data;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp14_ = p;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp15_ = g_hash_table_lookup (_tmp13_, _tmp14_);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp16_ = _page_view_ref0 ((PageView*) _tmp15_);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (prev_page);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				prev_page = _tmp17_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				prev_page = _tmp16_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
-#line 882 "book-view.c"
+#line 869 "book-view.c"
 			}
 		}
 	}
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = page;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = _page_view_ref0 (_tmp18_);
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp19_;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp17_ = page;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp18_ = _page_view_ref0 (_tmp17_);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	result = _tmp18_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (prev_page);
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 896 "book-view.c"
+#line 883 "book-view.c"
 }
 
 
 static void book_view_page_view_changed_cb (BookView* self, PageView* page) {
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 907 "book-view.c"
+#line 894 "book-view.c"
 }
 
 
 static void book_view_page_view_size_changed_cb (BookView* self, PageView* page) {
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 920 "book-view.c"
+#line 907 "book-view.c"
 }
 
 
 static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self) {
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_page_view_changed_cb (self, _sender);
-#line 927 "book-view.c"
+#line 914 "book-view.c"
 }
 
 
 static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self) {
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_page_view_size_changed_cb (self, _sender);
-#line 934 "book-view.c"
+#line 921 "book-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_ref (self) : NULL;
-#line 941 "book-view.c"
+#line 928 "book-view.c"
 }
 
 
 static void book_view_add_cb (BookView* self, Book* book, Page* page) {
-	Page* _tmp0_;
-	PageView* _tmp1_;
-	PageView* page_view;
-	GHashTable* _tmp2_;
-	Page* _tmp3_;
-	Page* _tmp4_;
-	PageView* _tmp5_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* page_view = NULL;
+	Page* _tmp0_ = NULL;
+	PageView* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+	PageView* _tmp5_ = NULL;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = page;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page_view_new (_tmp0_);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page_view = _tmp1_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (page_view, "changed", (GCallback) _book_view_page_view_changed_cb_page_view_changed, self, 0);
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (page_view, "size-changed", (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self, 0);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = self->priv->page_data;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = page;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _page_view_ref0 (page_view);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_insert (_tmp2_, _tmp4_, _tmp5_);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
-#line 985 "book-view.c"
+#line 972 "book-view.c"
 }
 
 
-static void book_view_set_selected_page (BookView* self, PageView* page) {
+static void book_view_set_selected_page_view (BookView* self, PageView* page) {
 	gboolean _tmp0_ = FALSE;
-	PageView* _tmp1_;
-	gboolean _tmp4_;
-	PageView* _tmp6_;
-	PageView* _tmp7_;
-	PageView* _tmp8_;
-	GtkWidget* _tmp9_;
+	PageView* _tmp1_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	PageView* _tmp6_ = NULL;
+	PageView* _tmp7_ = NULL;
+	PageView* _tmp8_ = NULL;
+	GtkWidget* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gboolean _tmp11_ = FALSE;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = self->priv->selected_page;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp1_ = self->priv->selected_page_view;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
-#line 1005 "book-view.c"
-		PageView* _tmp2_;
-		PageView* _tmp3_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 992 "book-view.c"
+		PageView* _tmp2_ = NULL;
+		PageView* _tmp3_ = NULL;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = page;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = self->priv->selected_page;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp3_ = self->priv->selected_page_view;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
-#line 1014 "book-view.c"
+#line 1001 "book-view.c"
 	} else {
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
-#line 1018 "book-view.c"
+#line 1005 "book-view.c"
 	}
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp0_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_) {
-#line 1024 "book-view.c"
-		PageView* _tmp5_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = self->priv->selected_page;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp5_, FALSE);
-#line 1030 "book-view.c"
+#line 1011 "book-view.c"
+		PageView* _tmp5_ = NULL;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp5_ = self->priv->selected_page_view;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		page_view_set_selected (_tmp5_, TRUE);
+#line 1017 "book-view.c"
 	}
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = page;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = _page_view_ref0 (_tmp6_);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (self->priv->selected_page);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->selected_page = _tmp7_;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = self->priv->selected_page;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_page_view_unref0 (self->priv->selected_page_view);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	self->priv->selected_page_view = _tmp7_;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp8_ = self->priv->selected_page_view;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp8_ == NULL) {
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 1046 "book-view.c"
+#line 1033 "book-view.c"
 	}
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = self->priv->drawing_area;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_get (_tmp9_, "has-focus", &_tmp10_, NULL);
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = _tmp10_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp11_) {
-#line 1056 "book-view.c"
-		PageView* _tmp12_;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = self->priv->selected_page;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 1043 "book-view.c"
+		PageView* _tmp12_ = NULL;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp12_ = self->priv->selected_page_view;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp12_, FALSE);
-#line 1062 "book-view.c"
+#line 1049 "book-view.c"
 	} else {
-		PageView* _tmp13_;
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp13_ = self->priv->selected_page;
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		PageView* _tmp13_ = NULL;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp13_ = self->priv->selected_page_view;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp13_, TRUE);
-#line 1069 "book-view.c"
+#line 1056 "book-view.c"
 	}
 }
 
 
-static void book_view_set_x_offset (BookView* self, gint offset) {
-	GtkAdjustment* _tmp0_;
-	gint _tmp1_;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->adjustment;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = offset;
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 1085 "book-view.c"
-}
-
-
-static gint book_view_get_x_offset (BookView* self) {
-	gint result = 0;
-	GtkAdjustment* _tmp0_;
-	gdouble _tmp1_ = 0.0;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->adjustment;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = (gint) _tmp1_;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 1103 "book-view.c"
-}
-
-
 static void book_view_show_page_view (BookView* self, PageView* page) {
 	gboolean _tmp0_ = FALSE;
-	PageView* _tmp1_;
-	gboolean _tmp4_;
+	PageView* _tmp1_ = NULL;
+	gboolean _tmp4_ = FALSE;
 	GtkAllocation allocation = {0};
-	GtkWidget* _tmp5_;
+	GtkWidget* _tmp5_ = NULL;
 	GtkAllocation _tmp6_ = {0};
-	PageView* _tmp7_;
+	gint left_edge = 0;
+	PageView* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-	gint left_edge;
-	PageView* _tmp9_;
-	gint _tmp10_ = 0;
-	PageView* _tmp11_;
+	gint _tmp9_ = 0;
+	gint right_edge = 0;
+	PageView* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-	gint right_edge;
-	gint _tmp13_;
+	PageView* _tmp13_ = NULL;
 	gint _tmp14_ = 0;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	gint _tmp17_ = 0;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ == NULL) {
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = TRUE;
-#line 1132 "book-view.c"
+#line 1089 "book-view.c"
 	} else {
-		GtkScrollbar* _tmp2_;
+		GtkScrollbar* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = self->priv->scroll;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = !_tmp3_;
-#line 1142 "book-view.c"
+#line 1099 "book-view.c"
 	}
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp0_;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_) {
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 1150 "book-view.c"
+#line 1107 "book-view.c"
 	}
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = self->priv->drawing_area;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation (_tmp5_, &_tmp6_);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	allocation = _tmp6_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = page;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = page_view_get_x_offset (_tmp7_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	left_edge = _tmp8_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp9_ = page;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = page_view_get_x_offset (_tmp9_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp11_ = page;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = page_view_get_width (_tmp11_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	right_edge = _tmp10_ + _tmp12_;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = left_edge;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = book_view_get_x_offset (self);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if ((_tmp13_ - _tmp14_) < 0) {
-#line 1180 "book-view.c"
-		gint _tmp15_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp15_ = left_edge;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_x_offset (self, _tmp15_);
-#line 1186 "book-view.c"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp9_ = _tmp8_;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	left_edge = _tmp9_;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp10_ = page;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp11_ = page_view_get_x_offset (_tmp10_);
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp12_ = _tmp11_;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp13_ = page;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp14_ = page_view_get_width (_tmp13_);
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	right_edge = _tmp12_ + _tmp14_;
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp15_ = left_edge;
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp16_ = book_view_get_x_offset (self);
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp17_ = _tmp16_;
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if ((_tmp15_ - _tmp17_) < 0) {
+#line 1143 "book-view.c"
+		gint _tmp18_ = 0;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp18_ = left_edge;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_set_x_offset (self, _tmp18_);
+#line 1149 "book-view.c"
 	} else {
-		gint _tmp16_;
-		gint _tmp17_ = 0;
-		GtkAllocation _tmp18_;
-		gint _tmp19_;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = right_edge;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp17_ = book_view_get_x_offset (self);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp18_ = allocation;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp19_ = _tmp18_.width;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if ((_tmp16_ - _tmp17_) > _tmp19_) {
-#line 1202 "book-view.c"
-			gint _tmp20_;
-			GtkAllocation _tmp21_;
-			gint _tmp22_;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp20_ = right_edge;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp21_ = allocation;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp22_ = _tmp21_.width;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_x_offset (self, _tmp20_ - _tmp22_);
-#line 1214 "book-view.c"
+		gint _tmp19_ = 0;
+		gint _tmp20_ = 0;
+		gint _tmp21_ = 0;
+		GtkAllocation _tmp22_ = {0};
+		gint _tmp23_ = 0;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp19_ = right_edge;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp20_ = book_view_get_x_offset (self);
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp21_ = _tmp20_;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp22_ = allocation;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp23_ = _tmp22_.width;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		if ((_tmp19_ - _tmp21_) > _tmp23_) {
+#line 1168 "book-view.c"
+			gint _tmp24_ = 0;
+			GtkAllocation _tmp25_ = {0};
+			gint _tmp26_ = 0;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp24_ = right_edge;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp25_ = allocation;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp26_ = _tmp25_.width;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			book_view_set_x_offset (self, _tmp24_ - _tmp26_);
+#line 1180 "book-view.c"
 		}
 	}
 }
 
 
 static void book_view_select_page_view (BookView* self, PageView* page) {
-	Page* p;
-	PageView* _tmp0_;
-	PageView* _tmp1_;
-	PageView* _tmp2_;
-	gboolean _tmp3_;
-	PageView* _tmp5_;
-	Page* _tmp8_;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	Page* p = NULL;
+	PageView* _tmp0_ = NULL;
+	PageView* _tmp1_ = NULL;
+	PageView* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	PageView* _tmp5_ = NULL;
+	Page* _tmp10_ = NULL;
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	p = NULL;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->selected_page_view;
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_unref0 (p);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 1242 "book-view.c"
+#line 1208 "book-view.c"
 	}
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_selected_page (self, _tmp2_);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	book_view_set_selected_page_view (self, _tmp2_);
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = self->priv->need_layout;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_) {
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->show_selected_page = TRUE;
-#line 1254 "book-view.c"
+#line 1220 "book-view.c"
 	} else {
-		PageView* _tmp4_;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		PageView* _tmp4_ = NULL;
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = page;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_show_page_view (self, _tmp4_);
-#line 1261 "book-view.c"
+#line 1227 "book-view.c"
 	}
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = page;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ != NULL) {
-#line 1267 "book-view.c"
-		PageView* _tmp6_;
+#line 1233 "book-view.c"
+		PageView* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		Page* _tmp8_ = NULL;
+		Page* _tmp9_ = NULL;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = page;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = page_view_get_page (_tmp6_);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp8_ = _tmp7_;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp9_ = _page_ref0 (_tmp8_);
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_unref0 (p);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		p = _tmp7_;
-#line 1278 "book-view.c"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		p = _tmp9_;
+#line 1250 "book-view.c"
 	}
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = p;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_emit_by_name (self, "page-selected", _tmp8_);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp10_ = p;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_signal_emit_by_name (self, "page-selected", _tmp10_);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (p);
-#line 1286 "book-view.c"
+#line 1258 "book-view.c"
 }
 
 
 static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
-	PageView* _tmp0_;
-	PageView* _tmp1_;
-	PageView* new_selection;
-	Page* _tmp2_;
+	PageView* new_selection = NULL;
+	PageView* _tmp0_ = NULL;
+	PageView* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
-	Page* _tmp4_;
-	gboolean _tmp5_;
-	GHashTable* _tmp12_;
-	Page* _tmp13_;
-	gconstpointer _tmp14_ = NULL;
-	PageView* _tmp15_;
-	PageView* page_view;
+	Page* _tmp4_ = NULL;
+	PageView* page_view = NULL;
+	GHashTable* _tmp11_ = NULL;
+	Page* _tmp12_ = NULL;
+	gconstpointer _tmp13_ = NULL;
+	PageView* _tmp14_ = NULL;
+	guint _tmp15_ = 0U;
 	guint _tmp16_ = 0U;
-	guint _tmp17_ = 0U;
-	GHashTable* _tmp18_;
-	Page* _tmp19_;
-	PageView* _tmp20_;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GHashTable* _tmp17_ = NULL;
+	Page* _tmp18_ = NULL;
+	PageView* _tmp19_ = NULL;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->selected_page_view;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _page_view_ref0 (_tmp0_);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	new_selection = _tmp1_;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = book_view_get_selected (self);
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp3_ = book_view_get_selected_page (self);
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp3_;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = _tmp2_ == _tmp4_;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_unref0 (_tmp4_);
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp5_) {
-#line 1332 "book-view.c"
-		PageView* _tmp6_;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp2_ == _tmp4_) {
+#line 1299 "book-view.c"
+		PageView* _tmp5_ = NULL;
+		PageView* _tmp6_ = NULL;
 		PageView* _tmp7_ = NULL;
-		PageView* _tmp8_;
-		PageView* _tmp9_;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = self->priv->selected_page;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = book_view_get_prev_page (self, _tmp6_);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		PageView* _tmp8_ = NULL;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp5_ = self->priv->selected_page_view;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp6_ = book_view_get_prev_page (self, _tmp5_);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (new_selection);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		new_selection = _tmp7_;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = new_selection;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp9_ = self->priv->selected_page;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp8_ == _tmp9_) {
-#line 1351 "book-view.c"
-			PageView* _tmp10_;
-			PageView* _tmp11_ = NULL;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp10_ = self->priv->selected_page;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp11_ = book_view_get_next_page (self, _tmp10_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		new_selection = _tmp6_;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp7_ = new_selection;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp8_ = self->priv->selected_page_view;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		if (_tmp7_ == _tmp8_) {
+#line 1318 "book-view.c"
+			PageView* _tmp9_ = NULL;
+			PageView* _tmp10_ = NULL;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp9_ = self->priv->selected_page_view;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp10_ = book_view_get_next_page (self, _tmp9_);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (new_selection);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			new_selection = _tmp11_;
-#line 1362 "book-view.c"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			new_selection = _tmp10_;
+#line 1329 "book-view.c"
 		}
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_view_unref0 (self->priv->selected_page);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		self->priv->selected_page = NULL;
-#line 1368 "book-view.c"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_page_view_unref0 (self->priv->selected_page_view);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		self->priv->selected_page_view = NULL;
+#line 1335 "book-view.c"
 	}
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = self->priv->page_data;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = page;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = g_hash_table_lookup (_tmp12_, _tmp13_);
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = _page_view_ref0 ((PageView*) _tmp14_);
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	page_view = _tmp15_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("changed", TYPE_PAGE_VIEW, &_tmp16_, NULL, FALSE);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _book_view_page_view_changed_cb_page_view_changed, self);
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("size-changed", TYPE_PAGE_VIEW, &_tmp17_, NULL, FALSE);
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self);
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = self->priv->page_data;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = page;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_hash_table_remove (_tmp18_, _tmp19_);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = new_selection;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_select_page_view (self, _tmp20_);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp11_ = self->priv->page_data;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp12_ = page;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp13_ = g_hash_table_lookup (_tmp11_, _tmp12_);
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp14_ = _page_view_ref0 ((PageView*) _tmp13_);
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	page_view = _tmp14_;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_signal_parse_name ("changed", TYPE_PAGE_VIEW, &_tmp15_, NULL, FALSE);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_page_view_changed_cb_page_view_changed, self);
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_signal_parse_name ("size-changed", TYPE_PAGE_VIEW, &_tmp16_, NULL, FALSE);
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self);
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp17_ = self->priv->page_data;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp18_ = page;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_hash_table_remove (_tmp17_, _tmp18_);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp19_ = new_selection;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	book_view_select_page_view (self, _tmp19_);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (new_selection);
-#line 1406 "book-view.c"
+#line 1373 "book-view.c"
 }
 
 
 static void book_view_reorder_cb (BookView* self, Book* book) {
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 1419 "book-view.c"
+#line 1386 "book-view.c"
 }
 
 
 static void book_view_clear_cb (BookView* self, Book* book) {
-	GHashTable* _tmp0_;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GHashTable* _tmp0_ = NULL;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->page_data;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_remove_all (_tmp0_);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (self->priv->selected_page);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->selected_page = NULL;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_page_view_unref0 (self->priv->selected_page_view);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	self->priv->selected_page_view = NULL;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_emit_by_name (self, "page-selected", NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 1443 "book-view.c"
-}
-
-
-Book* book_view_get_book (BookView* self) {
-	Book* result = NULL;
-	Book* _tmp0_;
-	Book* _tmp1_;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->book;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _book_ref0 (_tmp0_);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp1_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	return result;
-#line 1461 "book-view.c"
+#line 1410 "book-view.c"
 }
 
 
 static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 1479 "book-view.c"
+#line 1428 "book-view.c"
 }
 
 
 static void book_view_layout_into (BookView* self, gint width, gint height, gint* book_width, gint* book_height) {
 	gint _vala_book_width = 0;
 	gint _vala_book_height = 0;
-	gint max_dpi;
-	gint max_width;
-	gint max_height;
-	gint _tmp41_;
-	gint _tmp42_;
-	gdouble aspect;
-	gint _tmp43_;
-	gint _tmp44_;
-	gdouble max_aspect;
-	gint spacing;
-	gint x_offset;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gint max_dpi = 0;
+	gint max_width = 0;
+	gint max_height = 0;
+	gdouble aspect = 0.0;
+	gint _tmp49_ = 0;
+	gint _tmp50_ = 0;
+	gdouble max_aspect = 0.0;
+	gint _tmp51_ = 0;
+	gint _tmp52_ = 0;
+	gint spacing = 0;
+	gint x_offset = 0;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_dpi = 0;
-#line 1501 "book-view.c"
+#line 1450 "book-view.c"
 	{
-		gint i;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1506 "book-view.c"
+#line 1455 "book-view.c"
 		{
-			gboolean _tmp0_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp0_ = FALSE;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1513 "book-view.c"
-				gboolean _tmp1_;
-				gint _tmp3_;
-				Book* _tmp4_;
+#line 1462 "book-view.c"
+				gboolean _tmp1_ = FALSE;
+				gint _tmp3_ = 0;
+				Book* _tmp4_ = NULL;
 				guint _tmp5_ = 0U;
-				Book* _tmp6_;
-				gint _tmp7_;
-				Page* _tmp8_ = NULL;
-				Page* page;
-				Page* _tmp9_;
-				gint _tmp10_ = 0;
-				gint _tmp11_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				guint _tmp6_ = 0U;
+				Page* page = NULL;
+				Book* _tmp7_ = NULL;
+				gint _tmp8_ = 0;
+				Page* _tmp9_ = NULL;
+				Page* _tmp10_ = NULL;
+				gint _tmp11_ = 0;
+				gint _tmp12_ = 0;
+				gint _tmp13_ = 0;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = _tmp0_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp1_) {
-#line 1529 "book-view.c"
-					gint _tmp2_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 1480 "book-view.c"
+					gint _tmp2_ = 0;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp2_ = i;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp2_ + 1;
-#line 1535 "book-view.c"
+#line 1486 "book-view.c"
 				}
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = i;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = self->priv->book;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp4_ = self->priv->_book;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = book_get_n_pages (_tmp4_);
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp3_) < _tmp5_)) {
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp6_ = _tmp5_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp3_) < _tmp6_)) {
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1549 "book-view.c"
+#line 1502 "book-view.c"
 				}
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = self->priv->book;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = i;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp8_;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = page;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page_get_dpi (_tmp9_);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = max_dpi;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp10_ > _tmp11_) {
-#line 1567 "book-view.c"
-					Page* _tmp12_;
-					gint _tmp13_ = 0;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp12_ = page;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp13_ = page_get_dpi (_tmp12_);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_dpi = _tmp13_;
-#line 1576 "book-view.c"
-				}
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_page_unref0 (page);
-#line 1580 "book-view.c"
-			}
-		}
-	}
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_width = 0;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_height = 0;
-#line 1588 "book-view.c"
-	{
-		gint i;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		i = 0;
-#line 1593 "book-view.c"
-		{
-			gboolean _tmp14_;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp14_ = TRUE;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			while (TRUE) {
-#line 1600 "book-view.c"
-				gboolean _tmp15_;
-				gint _tmp17_;
-				Book* _tmp18_;
-				guint _tmp19_ = 0U;
-				Book* _tmp20_;
-				gint _tmp21_;
-				Page* _tmp22_ = NULL;
-				Page* page;
-				Page* _tmp23_;
-				gint _tmp24_ = 0;
-				gint w;
-				Page* _tmp25_;
-				gint _tmp26_ = 0;
-				gint h;
-				gint _tmp27_;
-				gint _tmp28_;
-				Page* _tmp29_;
-				gint _tmp30_ = 0;
-				gint _tmp31_;
-				gint _tmp32_;
-				Page* _tmp33_;
-				gint _tmp34_ = 0;
-				gint _tmp35_;
-				gint _tmp36_;
-				gint _tmp38_;
-				gint _tmp39_;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = _tmp14_;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp15_) {
-#line 1631 "book-view.c"
-					gint _tmp16_;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp16_ = i;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp16_ + 1;
-#line 1637 "book-view.c"
-				}
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = FALSE;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = i;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = self->priv->book;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp19_ = book_get_n_pages (_tmp18_);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp17_) < _tmp19_)) {
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					break;
-#line 1651 "book-view.c"
-				}
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = self->priv->book;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = i;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = book_get_page (_tmp20_, _tmp21_);
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp22_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = page;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = page_get_width (_tmp23_);
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				w = _tmp24_;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = page;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = page_get_height (_tmp25_);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = _tmp26_;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = w;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp28_ = max_dpi;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp29_ = page;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp30_ = page_get_dpi (_tmp29_);
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				w = (gint) (((((gdouble) _tmp27_) * _tmp28_) / _tmp30_) + 0.5);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp31_ = h;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp32_ = max_dpi;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp33_ = page;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp34_ = page_get_dpi (_tmp33_);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp34_) + 0.5);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = w;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp36_ = max_width;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp35_ > _tmp36_) {
-#line 1699 "book-view.c"
-					gint _tmp37_;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp37_ = w;
+				_tmp7_ = self->priv->_book;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_width = _tmp37_;
-#line 1705 "book-view.c"
-				}
+				_tmp8_ = i;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp9_ = book_get_page (_tmp7_, _tmp8_);
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page = _tmp9_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp38_ = h;
+				_tmp10_ = page;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp39_ = max_height;
+				_tmp11_ = page_get_dpi (_tmp10_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp38_ > _tmp39_) {
-#line 1713 "book-view.c"
-					gint _tmp40_;
+				_tmp12_ = _tmp11_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp13_ = max_dpi;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp12_ > _tmp13_) {
+#line 1522 "book-view.c"
+					Page* _tmp14_ = NULL;
+					gint _tmp15_ = 0;
+					gint _tmp16_ = 0;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp14_ = page;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp15_ = page_get_dpi (_tmp14_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp40_ = h;
+					_tmp16_ = _tmp15_;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_height = _tmp40_;
-#line 1719 "book-view.c"
+					max_dpi = _tmp16_;
+#line 1534 "book-view.c"
 				}
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
-#line 1723 "book-view.c"
+#line 1538 "book-view.c"
 			}
 		}
 	}
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp41_ = width;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp42_ = height;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	aspect = ((gdouble) _tmp41_) / _tmp42_;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp43_ = max_width;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp44_ = max_height;
+	max_width = 0;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_aspect = ((gdouble) _tmp43_) / _tmp44_;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	spacing = 12;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_vala_book_width = 0;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_vala_book_height = 0;
-#line 1745 "book-view.c"
+	max_height = 0;
+#line 1546 "book-view.c"
 	{
-		gint i;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1750 "book-view.c"
+#line 1551 "book-view.c"
 		{
-			gboolean _tmp45_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp45_ = TRUE;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp17_ = FALSE;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp17_ = TRUE;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1757 "book-view.c"
-				gboolean _tmp46_;
-				gint _tmp48_;
-				Book* _tmp49_;
-				guint _tmp50_ = 0U;
-				gint _tmp51_;
-				PageView* _tmp52_ = NULL;
-				PageView* page;
-				PageView* _tmp53_;
-				Page* _tmp54_ = NULL;
-				Page* p;
-				gdouble _tmp55_;
-				gdouble _tmp56_;
-				PageView* _tmp75_;
-				gint _tmp76_ = 0;
-				gint h;
-				gint _tmp77_;
-				gint _tmp78_;
-				gint _tmp80_;
-				PageView* _tmp81_;
-				gint _tmp82_ = 0;
-				gint _tmp83_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp46_ = _tmp45_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp46_) {
-#line 1783 "book-view.c"
-					gint _tmp47_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp47_ = i;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp47_ + 1;
-#line 1789 "book-view.c"
+#line 1558 "book-view.c"
+				gboolean _tmp18_ = FALSE;
+				gint _tmp20_ = 0;
+				Book* _tmp21_ = NULL;
+				guint _tmp22_ = 0U;
+				guint _tmp23_ = 0U;
+				Page* page = NULL;
+				Book* _tmp24_ = NULL;
+				gint _tmp25_ = 0;
+				Page* _tmp26_ = NULL;
+				gint w = 0;
+				Page* _tmp27_ = NULL;
+				gint _tmp28_ = 0;
+				gint _tmp29_ = 0;
+				gint h = 0;
+				Page* _tmp30_ = NULL;
+				gint _tmp31_ = 0;
+				gint _tmp32_ = 0;
+				gint _tmp33_ = 0;
+				gint _tmp34_ = 0;
+				Page* _tmp35_ = NULL;
+				gint _tmp36_ = 0;
+				gint _tmp37_ = 0;
+				gint _tmp38_ = 0;
+				gint _tmp39_ = 0;
+				Page* _tmp40_ = NULL;
+				gint _tmp41_ = 0;
+				gint _tmp42_ = 0;
+				gint _tmp43_ = 0;
+				gint _tmp44_ = 0;
+				gint _tmp46_ = 0;
+				gint _tmp47_ = 0;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp18_ = _tmp17_;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!_tmp18_) {
+#line 1594 "book-view.c"
+					gint _tmp19_ = 0;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp19_ = i;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					i = _tmp19_ + 1;
+#line 1600 "book-view.c"
 				}
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp45_ = FALSE;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp48_ = i;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp49_ = self->priv->book;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp50_ = book_get_n_pages (_tmp49_);
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp48_) < _tmp50_)) {
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp17_ = FALSE;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp20_ = i;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp21_ = self->priv->_book;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp22_ = book_get_n_pages (_tmp21_);
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp23_ = _tmp22_;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp20_) < _tmp23_)) {
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1803 "book-view.c"
+#line 1616 "book-view.c"
 				}
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp24_ = self->priv->_book;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp25_ = i;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp26_ = book_get_page (_tmp24_, _tmp25_);
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page = _tmp26_;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp27_ = page;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp28_ = page_get_width (_tmp27_);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp29_ = _tmp28_;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				w = _tmp29_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp30_ = page;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp31_ = page_get_height (_tmp30_);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp32_ = _tmp31_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				h = _tmp32_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp33_ = w;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp34_ = max_dpi;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp35_ = page;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp51_ = i;
+				_tmp36_ = page_get_dpi (_tmp35_);
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp52_ = book_view_get_nth_page (self, _tmp51_);
+				_tmp37_ = _tmp36_;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp52_;
+				w = (gint) (((((gdouble) _tmp33_) * _tmp34_) / _tmp37_) + 0.5);
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp53_ = page;
+				_tmp38_ = h;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp54_ = page_view_get_page (_tmp53_);
+				_tmp39_ = max_dpi;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp54_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp55_ = max_aspect;
+				_tmp40_ = page;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp41_ = page_get_dpi (_tmp40_);
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp42_ = _tmp41_;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				h = (gint) (((((gdouble) _tmp38_) * _tmp39_) / _tmp42_) + 0.5);
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp43_ = w;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp44_ = max_width;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp43_ > _tmp44_) {
+#line 1672 "book-view.c"
+					gint _tmp45_ = 0;
 #line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp56_ = aspect;
+					_tmp45_ = w;
 #line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp55_ > _tmp56_) {
-#line 1823 "book-view.c"
-					Page* _tmp57_;
-					gint _tmp58_ = 0;
-					gint _tmp59_;
-					gint _tmp60_;
-					Page* _tmp61_;
-					gint _tmp62_ = 0;
-					gint _tmp63_;
-					gint w;
-					PageView* _tmp64_;
-					gint _tmp65_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp57_ = p;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp58_ = page_get_width (_tmp57_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp59_ = max_dpi;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp60_ = width;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp61_ = p;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp62_ = page_get_dpi (_tmp61_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp63_ = max_width;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					w = (gint) (((((gdouble) _tmp58_) * _tmp59_) * _tmp60_) / (_tmp62_ * _tmp63_));
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp64_ = page;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp65_ = w;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					page_view_set_width (_tmp64_, _tmp65_);
-#line 1856 "book-view.c"
-				} else {
-					Page* _tmp66_;
-					gint _tmp67_ = 0;
-					gint _tmp68_;
-					gint _tmp69_;
-					Page* _tmp70_;
-					gint _tmp71_ = 0;
-					gint _tmp72_;
-					gint h;
-					PageView* _tmp73_;
-					gint _tmp74_;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp66_ = p;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp67_ = page_get_height (_tmp66_);
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp68_ = max_dpi;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp69_ = height;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp70_ = p;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp71_ = page_get_dpi (_tmp70_);
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp72_ = max_height;
+					max_width = _tmp45_;
+#line 1678 "book-view.c"
+				}
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp46_ = h;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp47_ = max_height;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp46_ > _tmp47_) {
+#line 1686 "book-view.c"
+					gint _tmp48_ = 0;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp48_ = h;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					max_height = _tmp48_;
+#line 1692 "book-view.c"
+				}
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_page_unref0 (page);
+#line 1696 "book-view.c"
+			}
+		}
+	}
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp49_ = width;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp50_ = height;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	aspect = ((gdouble) _tmp49_) / _tmp50_;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp51_ = max_width;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp52_ = max_height;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	max_aspect = ((gdouble) _tmp51_) / _tmp52_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					h = (gint) (((((gdouble) _tmp67_) * _tmp68_) * _tmp69_) / (_tmp71_ * _tmp72_));
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp73_ = page;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp74_ = h;
+	spacing = 12;
 #line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					page_view_set_height (_tmp73_, _tmp74_);
-#line 1890 "book-view.c"
+	_vala_book_width = 0;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_vala_book_height = 0;
+#line 1718 "book-view.c"
+	{
+		gint i = 0;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		i = 0;
+#line 1723 "book-view.c"
+		{
+			gboolean _tmp53_ = FALSE;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp53_ = TRUE;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			while (TRUE) {
+#line 1730 "book-view.c"
+				gboolean _tmp54_ = FALSE;
+				gint _tmp56_ = 0;
+				Book* _tmp57_ = NULL;
+				guint _tmp58_ = 0U;
+				guint _tmp59_ = 0U;
+				PageView* page = NULL;
+				gint _tmp60_ = 0;
+				PageView* _tmp61_ = NULL;
+				Page* p = NULL;
+				PageView* _tmp62_ = NULL;
+				Page* _tmp63_ = NULL;
+				Page* _tmp64_ = NULL;
+				Page* _tmp65_ = NULL;
+				gdouble _tmp66_ = 0.0;
+				gdouble _tmp67_ = 0.0;
+				gint h = 0;
+				PageView* _tmp90_ = NULL;
+				gint _tmp91_ = 0;
+				gint _tmp92_ = 0;
+				gint _tmp93_ = 0;
+				gint _tmp95_ = 0;
+				PageView* _tmp96_ = NULL;
+				gint _tmp97_ = 0;
+				gint _tmp98_ = 0;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp54_ = _tmp53_;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!_tmp54_) {
+#line 1759 "book-view.c"
+					gint _tmp55_ = 0;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp55_ = i;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					i = _tmp55_ + 1;
+#line 1765 "book-view.c"
+				}
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp53_ = FALSE;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp56_ = i;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp57_ = self->priv->_book;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp58_ = book_get_n_pages (_tmp57_);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp59_ = _tmp58_;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp56_) < _tmp59_)) {
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					break;
+#line 1781 "book-view.c"
 				}
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp75_ = page;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp76_ = page_view_get_height (_tmp75_);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = _tmp76_;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp77_ = h;
+				_tmp60_ = i;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp78_ = _vala_book_height;
+				_tmp61_ = book_view_get_nth_page (self, _tmp60_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp77_ > _tmp78_) {
-#line 1904 "book-view.c"
-					gint _tmp79_;
+				page = _tmp61_;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp79_ = h;
+				_tmp62_ = page;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_book_height = _tmp79_;
-#line 1910 "book-view.c"
-				}
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp80_ = _vala_book_width;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp81_ = page;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp82_ = page_view_get_width (_tmp81_);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_vala_book_width = _tmp80_ + _tmp82_;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp83_ = i;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp83_ != 0) {
-#line 1924 "book-view.c"
-					gint _tmp84_;
-					gint _tmp85_;
+				_tmp63_ = page_view_get_page (_tmp62_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp64_ = _tmp63_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp65_ = _page_ref0 (_tmp64_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				p = _tmp65_;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp84_ = _vala_book_width;
+				_tmp66_ = max_aspect;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp85_ = spacing;
+				_tmp67_ = aspect;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_book_width = _tmp84_ + _tmp85_;
-#line 1933 "book-view.c"
+				if (_tmp66_ > _tmp67_) {
+#line 1805 "book-view.c"
+					gint w = 0;
+					Page* _tmp68_ = NULL;
+					gint _tmp69_ = 0;
+					gint _tmp70_ = 0;
+					gint _tmp71_ = 0;
+					gint _tmp72_ = 0;
+					Page* _tmp73_ = NULL;
+					gint _tmp74_ = 0;
+					gint _tmp75_ = 0;
+					gint _tmp76_ = 0;
+					PageView* _tmp77_ = NULL;
+					gint _tmp78_ = 0;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp68_ = p;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp69_ = page_get_width (_tmp68_);
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp70_ = _tmp69_;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp71_ = max_dpi;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp72_ = width;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp73_ = p;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp74_ = page_get_dpi (_tmp73_);
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp75_ = _tmp74_;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp76_ = max_width;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					w = (gint) (((((gdouble) _tmp70_) * _tmp71_) * _tmp72_) / (_tmp75_ * _tmp76_));
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp77_ = page;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp78_ = w;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					page_view_set_width (_tmp77_, _tmp78_);
+#line 1844 "book-view.c"
+				} else {
+					gint h = 0;
+					Page* _tmp79_ = NULL;
+					gint _tmp80_ = 0;
+					gint _tmp81_ = 0;
+					gint _tmp82_ = 0;
+					gint _tmp83_ = 0;
+					Page* _tmp84_ = NULL;
+					gint _tmp85_ = 0;
+					gint _tmp86_ = 0;
+					gint _tmp87_ = 0;
+					PageView* _tmp88_ = NULL;
+					gint _tmp89_ = 0;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp79_ = p;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp80_ = page_get_height (_tmp79_);
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp81_ = _tmp80_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp82_ = max_dpi;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp83_ = height;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp84_ = p;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp85_ = page_get_dpi (_tmp84_);
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp86_ = _tmp85_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp87_ = max_height;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					h = (gint) (((((gdouble) _tmp81_) * _tmp82_) * _tmp83_) / (_tmp86_ * _tmp87_));
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp88_ = page;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp89_ = h;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					page_view_set_height (_tmp88_, _tmp89_);
+#line 1884 "book-view.c"
 				}
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp90_ = page;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp91_ = page_view_get_height (_tmp90_);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				h = _tmp91_;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp92_ = h;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp93_ = _vala_book_height;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp92_ > _tmp93_) {
+#line 1898 "book-view.c"
+					gint _tmp94_ = 0;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp94_ = h;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_vala_book_height = _tmp94_;
+#line 1904 "book-view.c"
+				}
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp95_ = _vala_book_width;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp96_ = page;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp97_ = page_view_get_width (_tmp96_);
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_vala_book_width = _tmp95_ + _tmp97_;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp98_ = i;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp98_ != 0) {
+#line 1918 "book-view.c"
+					gint _tmp99_ = 0;
+					gint _tmp100_ = 0;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp99_ = _vala_book_width;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp100_ = spacing;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_vala_book_width = _tmp99_ + _tmp100_;
+#line 1927 "book-view.c"
+				}
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 1939 "book-view.c"
+#line 1933 "book-view.c"
 			}
 		}
 	}
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x_offset = 0;
-#line 1945 "book-view.c"
+#line 1939 "book-view.c"
 	{
-		gint i;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1950 "book-view.c"
+#line 1944 "book-view.c"
 		{
-			gboolean _tmp86_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp86_ = TRUE;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp101_ = FALSE;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp101_ = TRUE;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1957 "book-view.c"
-				gboolean _tmp87_;
-				gint _tmp89_;
-				Book* _tmp90_;
-				guint _tmp91_ = 0U;
-				gint _tmp92_;
-				PageView* _tmp93_ = NULL;
-				PageView* page;
-				PageView* _tmp94_;
-				gint _tmp95_;
-				gint _tmp96_;
-				PageView* _tmp97_;
-				gint _tmp98_ = 0;
-				gint _tmp99_;
-				PageView* _tmp100_;
-				gint _tmp101_;
-				PageView* _tmp102_;
-				gint _tmp103_ = 0;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp87_ = _tmp86_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp87_) {
-#line 1979 "book-view.c"
-					gint _tmp88_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp88_ = i;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp88_ + 1;
-#line 1985 "book-view.c"
+#line 1951 "book-view.c"
+				gboolean _tmp102_ = FALSE;
+				gint _tmp104_ = 0;
+				Book* _tmp105_ = NULL;
+				guint _tmp106_ = 0U;
+				guint _tmp107_ = 0U;
+				PageView* page = NULL;
+				gint _tmp108_ = 0;
+				PageView* _tmp109_ = NULL;
+				PageView* _tmp110_ = NULL;
+				gint _tmp111_ = 0;
+				gint _tmp112_ = 0;
+				PageView* _tmp113_ = NULL;
+				gint _tmp114_ = 0;
+				gint _tmp115_ = 0;
+				PageView* _tmp116_ = NULL;
+				gint _tmp117_ = 0;
+				PageView* _tmp118_ = NULL;
+				gint _tmp119_ = 0;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp102_ = _tmp101_;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!_tmp102_) {
+#line 1974 "book-view.c"
+					gint _tmp103_ = 0;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp103_ = i;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					i = _tmp103_ + 1;
+#line 1980 "book-view.c"
 				}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp86_ = FALSE;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp89_ = i;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp90_ = self->priv->book;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp91_ = book_get_n_pages (_tmp90_);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp89_) < _tmp91_)) {
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp101_ = FALSE;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp104_ = i;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp105_ = self->priv->_book;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp106_ = book_get_n_pages (_tmp105_);
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp107_ = _tmp106_;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp104_) < _tmp107_)) {
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1999 "book-view.c"
+#line 1996 "book-view.c"
 				}
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp92_ = i;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp93_ = book_view_get_nth_page (self, _tmp92_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp93_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp94_ = page;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp95_ = x_offset;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_set_x_offset (_tmp94_, _tmp95_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp96_ = x_offset;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp97_ = page;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp98_ = page_view_get_width (_tmp97_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp99_ = spacing;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				x_offset = _tmp96_ + (_tmp98_ + _tmp99_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp100_ = page;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp101_ = height;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp102_ = page;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp103_ = page_view_get_height (_tmp102_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_set_y_offset (_tmp100_, (_tmp101_ - _tmp103_) / 2);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp108_ = i;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp109_ = book_view_get_nth_page (self, _tmp108_);
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page = _tmp109_;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp110_ = page;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp111_ = x_offset;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page_view_set_x_offset (_tmp110_, _tmp111_);
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp112_ = x_offset;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp113_ = page;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp114_ = page_view_get_width (_tmp113_);
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp115_ = spacing;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				x_offset = _tmp112_ + (_tmp114_ + _tmp115_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp116_ = page;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp117_ = height;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp118_ = page;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp119_ = page_view_get_height (_tmp118_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page_view_set_y_offset (_tmp116_, (_tmp117_ - _tmp119_) / 2);
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 2035 "book-view.c"
+#line 2032 "book-view.c"
 			}
 		}
 	}
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_width) {
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_width = _vala_book_width;
-#line 2043 "book-view.c"
+#line 2040 "book-view.c"
 	}
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_height) {
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_height = _vala_book_height;
-#line 2049 "book-view.c"
+#line 2046 "book-view.c"
 	}
 }
 
 
 static void book_view_layout (BookView* self) {
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	GtkAllocation allocation = {0};
-	GtkWidget* _tmp1_;
+	GtkWidget* _tmp1_ = NULL;
 	GtkAllocation _tmp2_ = {0};
 	GtkAllocation box_allocation = {0};
 	GtkAllocation _tmp3_ = {0};
-	gboolean right_aligned;
-	GtkAdjustment* _tmp4_;
+	gboolean right_aligned = FALSE;
+	GtkAdjustment* _tmp4_ = NULL;
 	gdouble _tmp5_ = 0.0;
-	GtkAdjustment* _tmp6_;
+	GtkAdjustment* _tmp6_ = NULL;
 	gdouble _tmp7_ = 0.0;
-	GtkAdjustment* _tmp8_;
+	GtkAdjustment* _tmp8_ = NULL;
 	gdouble _tmp9_ = 0.0;
-	GtkAllocation _tmp10_;
-	gint _tmp11_;
-	gint width;
-	GtkAllocation _tmp12_;
-	gint _tmp13_;
+	gint width = 0;
+	GtkAllocation _tmp10_ = {0};
+	gint _tmp11_ = 0;
+	gint height = 0;
+	GtkAllocation _tmp12_ = {0};
+	gint _tmp13_ = 0;
 	guint _tmp14_ = 0U;
-	gint height;
 	gint book_width = 0;
 	gint book_height = 0;
-	gint _tmp15_;
-	gint _tmp16_;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
 	gint _tmp18_ = 0;
-	gint _tmp19_;
-	GtkAllocation _tmp20_;
-	gint _tmp21_;
-	gboolean _tmp54_;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gint _tmp19_ = 0;
+	GtkAllocation _tmp20_ = {0};
+	gint _tmp21_ = 0;
+	gboolean _tmp55_ = FALSE;
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->need_layout;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp0_) {
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 2093 "book-view.c"
+#line 2090 "book-view.c"
 	}
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = TRUE;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->drawing_area;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation (_tmp1_, &_tmp2_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	allocation = _tmp2_;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_);
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	box_allocation = _tmp3_;
-#line 368 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right_aligned = TRUE;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = self->priv->adjustment;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = gtk_adjustment_get_value (_tmp4_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = self->priv->adjustment;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = gtk_adjustment_get_upper (_tmp6_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->adjustment;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = gtk_adjustment_get_page_size (_tmp8_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ < (_tmp7_ - _tmp9_)) {
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		right_aligned = FALSE;
-#line 2125 "book-view.c"
+#line 2122 "book-view.c"
 	}
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = allocation;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = _tmp10_.width;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	width = (gint) _tmp11_;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = box_allocation;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = _tmp12_.height;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = gtk_container_get_border_width ((GtkContainer*) self);
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	height = (gint) (_tmp13_ - (_tmp14_ * 2));
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = width;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = height;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout_into (self, _tmp15_, _tmp16_, &_tmp17_, &_tmp18_);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_width = _tmp17_;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_height = _tmp18_;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = book_width;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = allocation;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = _tmp20_.width;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 2159 "book-view.c"
-		GtkAllocation _tmp22_;
-		gint _tmp23_;
-		gint _tmp24_;
-		gint _tmp25_;
+#line 2156 "book-view.c"
+		GtkAllocation _tmp22_ = {0};
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-		GtkAdjustment* _tmp28_;
-		GtkAdjustment* _tmp29_;
-		gint _tmp30_;
-		GtkAdjustment* _tmp31_;
-		GtkAllocation _tmp32_;
-		gint _tmp33_;
-		gint _tmp34_;
-		GtkAllocation _tmp35_;
-		gint _tmp36_;
-		gint max_offset;
+		GtkAdjustment* _tmp28_ = NULL;
+		GtkAdjustment* _tmp29_ = NULL;
+		gint _tmp30_ = 0;
+		GtkAdjustment* _tmp31_ = NULL;
+		GtkAllocation _tmp32_ = {0};
+		gint _tmp33_ = 0;
+		gint max_offset = 0;
+		gint _tmp34_ = 0;
+		GtkAllocation _tmp35_ = {0};
+		gint _tmp36_ = 0;
 		gboolean _tmp37_ = FALSE;
-		gboolean _tmp38_;
-		gboolean _tmp41_;
-		GtkScrollbar* _tmp43_;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gboolean _tmp38_ = FALSE;
+		gboolean _tmp42_ = FALSE;
+		GtkScrollbar* _tmp44_ = NULL;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = allocation;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp23_ = _tmp22_.height;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		height = _tmp23_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp24_ = width;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp25_ = height;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_layout_into (self, _tmp24_, _tmp25_, &_tmp26_, &_tmp27_);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_width = _tmp26_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_height = _tmp27_;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp28_ = self->priv->adjustment;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_lower (_tmp28_, (gdouble) 0);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp29_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp30_ = book_width;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_upper (_tmp29_, (gdouble) _tmp30_);
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp31_ = self->priv->adjustment;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp32_ = allocation;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp33_ = _tmp32_.width;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_page_size (_tmp31_, (gdouble) _tmp33_);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp34_ = book_width;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp35_ = allocation;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp36_ = _tmp35_.width;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		max_offset = _tmp34_ - _tmp36_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp38_ = right_aligned;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp38_) {
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = TRUE;
-#line 2228 "book-view.c"
+#line 2225 "book-view.c"
 		} else {
 			gint _tmp39_ = 0;
-			gint _tmp40_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gint _tmp40_ = 0;
+			gint _tmp41_ = 0;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp39_ = book_view_get_x_offset (self);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp40_ = max_offset;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp37_ = _tmp39_ > _tmp40_;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp40_ = _tmp39_;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp41_ = max_offset;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp37_ = _tmp40_ > _tmp41_;
 #line 2238 "book-view.c"
 		}
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp41_ = _tmp37_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp41_) {
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp42_ = _tmp37_;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		if (_tmp42_) {
 #line 2244 "book-view.c"
-			gint _tmp42_;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp42_ = max_offset;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_x_offset (self, _tmp42_);
+			gint _tmp43_ = 0;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp43_ = max_offset;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			book_view_set_x_offset (self, _tmp43_);
 #line 2250 "book-view.c"
 		}
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp43_ = self->priv->scroll;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_widget_show ((GtkWidget*) _tmp43_);
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp44_ = self->priv->scroll;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gtk_widget_show ((GtkWidget*) _tmp44_);
 #line 2256 "book-view.c"
 	} else {
-		GtkScrollbar* _tmp44_;
-		gint _tmp45_;
-		GtkAllocation _tmp46_;
-		gint _tmp47_;
-		gint offset;
-		GtkAdjustment* _tmp48_;
-		gint _tmp49_;
-		GtkAdjustment* _tmp50_;
-		gint _tmp51_;
-		GtkAdjustment* _tmp52_;
-		gint _tmp53_;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp44_ = self->priv->scroll;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_widget_hide ((GtkWidget*) _tmp44_);
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp45_ = book_width;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp46_ = allocation;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp47_ = _tmp46_.width;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		offset = (_tmp45_ - _tmp47_) / 2;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp48_ = self->priv->adjustment;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp49_ = offset;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_lower (_tmp48_, (gdouble) _tmp49_);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp50_ = self->priv->adjustment;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp51_ = offset;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_upper (_tmp50_, (gdouble) _tmp51_);
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp52_ = self->priv->adjustment;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_page_size (_tmp52_, (gdouble) 0);
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp53_ = offset;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_x_offset (self, _tmp53_);
+		GtkScrollbar* _tmp45_ = NULL;
+		gint offset = 0;
+		gint _tmp46_ = 0;
+		GtkAllocation _tmp47_ = {0};
+		gint _tmp48_ = 0;
+		GtkAdjustment* _tmp49_ = NULL;
+		gint _tmp50_ = 0;
+		GtkAdjustment* _tmp51_ = NULL;
+		gint _tmp52_ = 0;
+		GtkAdjustment* _tmp53_ = NULL;
+		gint _tmp54_ = 0;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp45_ = self->priv->scroll;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gtk_widget_hide ((GtkWidget*) _tmp45_);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp46_ = book_width;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp47_ = allocation;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp48_ = _tmp47_.width;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		offset = (_tmp46_ - _tmp48_) / 2;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp49_ = self->priv->adjustment;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp50_ = offset;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gtk_adjustment_set_lower (_tmp49_, (gdouble) _tmp50_);
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp51_ = self->priv->adjustment;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp52_ = offset;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gtk_adjustment_set_upper (_tmp51_, (gdouble) _tmp52_);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp53_ = self->priv->adjustment;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gtk_adjustment_set_page_size (_tmp53_, (gdouble) 0);
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp54_ = offset;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_set_x_offset (self, _tmp54_);
 #line 2301 "book-view.c"
 	}
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp54_ = self->priv->show_selected_page;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp54_) {
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp55_ = self->priv->show_selected_page;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp55_) {
 #line 2307 "book-view.c"
-		PageView* _tmp55_;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp55_ = self->priv->selected_page;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_show_page_view (self, _tmp55_);
+		PageView* _tmp56_ = NULL;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp56_ = self->priv->selected_page_view;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_show_page_view (self, _tmp56_);
 #line 2313 "book-view.c"
 	}
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = FALSE;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->show_selected_page = FALSE;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = FALSE;
 #line 2321 "book-view.c"
 }
@@ -2323,251 +2323,284 @@ static void book_view_layout (BookView* self) {
 
 static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* context) {
 	gboolean result = FALSE;
-	Book* _tmp0_;
+	Book* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
+	guint _tmp2_ = 0U;
 	gdouble left = 0.0;
 	gdouble top = 0.0;
 	gdouble right = 0.0;
 	gdouble bottom = 0.0;
-	cairo_t* _tmp2_;
-	gdouble _tmp3_ = 0.0;
+	cairo_t* _tmp3_ = NULL;
 	gdouble _tmp4_ = 0.0;
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gdouble _tmp7_ = 0.0;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (context != NULL, FALSE);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->book;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->_book;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_get_n_pages (_tmp0_);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp1_ == ((guint) 0)) {
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp2_ = _tmp1_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp2_ == ((guint) 0)) {
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = FALSE;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 2354 "book-view.c"
+#line 2357 "book-view.c"
 	}
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = context;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	cairo_clip_extents (_tmp2_, &_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	left = _tmp3_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	top = _tmp4_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	right = _tmp5_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	bottom = _tmp6_;
-#line 2370 "book-view.c"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp3_ = context;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	cairo_clip_extents (_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	left = _tmp4_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	top = _tmp5_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	right = _tmp6_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	bottom = _tmp7_;
+#line 2373 "book-view.c"
 	{
-		gint i;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 2375 "book-view.c"
+#line 2378 "book-view.c"
 		{
-			gboolean _tmp7_;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp7_ = TRUE;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp8_ = FALSE;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp8_ = TRUE;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 2382 "book-view.c"
-				gboolean _tmp8_;
-				gint _tmp10_;
-				Book* _tmp11_;
-				guint _tmp12_ = 0U;
-				gint _tmp13_;
-				PageView* _tmp14_ = NULL;
-				PageView* page;
-				PageView* _tmp15_;
-				gint _tmp16_ = 0;
-				gint _tmp17_ = 0;
-				gint left_edge;
-				PageView* _tmp18_;
+#line 2385 "book-view.c"
+				gboolean _tmp9_ = FALSE;
+				gint _tmp11_ = 0;
+				Book* _tmp12_ = NULL;
+				guint _tmp13_ = 0U;
+				guint _tmp14_ = 0U;
+				PageView* page = NULL;
+				gint _tmp15_ = 0;
+				PageView* _tmp16_ = NULL;
+				gint left_edge = 0;
+				PageView* _tmp17_ = NULL;
+				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
-				PageView* _tmp20_;
+				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-				gint _tmp22_ = 0;
-				gint right_edge;
-				gboolean _tmp23_ = FALSE;
-				gint _tmp24_;
-				gdouble _tmp25_;
-				gboolean _tmp28_;
-				cairo_t* _tmp29_;
-				cairo_t* _tmp30_;
-				gint _tmp31_ = 0;
-				PageView* _tmp32_;
-				cairo_t* _tmp33_;
-				cairo_t* _tmp34_;
-				PageView* _tmp35_;
-				gboolean _tmp36_ = FALSE;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = _tmp7_;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp8_) {
-#line 2416 "book-view.c"
-					gint _tmp9_;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp9_ = i;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp9_ + 1;
-#line 2422 "book-view.c"
+				gint right_edge = 0;
+				PageView* _tmp22_ = NULL;
+				gint _tmp23_ = 0;
+				gint _tmp24_ = 0;
+				PageView* _tmp25_ = NULL;
+				gint _tmp26_ = 0;
+				gint _tmp27_ = 0;
+				gint _tmp28_ = 0;
+				gboolean _tmp29_ = FALSE;
+				gint _tmp30_ = 0;
+				gdouble _tmp31_ = 0.0;
+				gboolean _tmp34_ = FALSE;
+				cairo_t* _tmp35_ = NULL;
+				cairo_t* _tmp36_ = NULL;
+				gint _tmp37_ = 0;
+				gint _tmp38_ = 0;
+				PageView* _tmp39_ = NULL;
+				cairo_t* _tmp40_ = NULL;
+				cairo_t* _tmp41_ = NULL;
+				PageView* _tmp42_ = NULL;
+				gboolean _tmp43_ = FALSE;
+				gboolean _tmp44_ = FALSE;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp9_ = _tmp8_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!_tmp9_) {
+#line 2426 "book-view.c"
+					gint _tmp10_ = 0;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp10_ = i;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					i = _tmp10_ + 1;
+#line 2432 "book-view.c"
 				}
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = FALSE;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = i;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = self->priv->book;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = book_get_n_pages (_tmp11_);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp10_) < _tmp12_)) {
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp8_ = FALSE;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp11_ = i;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp12_ = self->priv->_book;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp13_ = book_get_n_pages (_tmp12_);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp14_ = _tmp13_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp11_) < _tmp14_)) {
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 2436 "book-view.c"
+#line 2448 "book-view.c"
 				}
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = i;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = book_view_get_nth_page (self, _tmp13_);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp14_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = page;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = page_view_get_x_offset (_tmp15_);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = book_view_get_x_offset (self);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				left_edge = _tmp16_ - _tmp17_;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = page;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp19_ = page_view_get_x_offset (_tmp18_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = page;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = page_view_get_width (_tmp20_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = book_view_get_x_offset (self);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				right_edge = (_tmp19_ + _tmp21_) - _tmp22_;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = right_edge;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = left;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (((gdouble) _tmp24_) < _tmp25_) {
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp23_ = TRUE;
-#line 2472 "book-view.c"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp15_ = i;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp16_ = book_view_get_nth_page (self, _tmp15_);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page = _tmp16_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp17_ = page;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp18_ = page_view_get_x_offset (_tmp17_);
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp19_ = _tmp18_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp20_ = book_view_get_x_offset (self);
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp21_ = _tmp20_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				left_edge = _tmp19_ - _tmp21_;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp22_ = page;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp23_ = page_view_get_x_offset (_tmp22_);
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp24_ = _tmp23_;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp25_ = page;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp26_ = page_view_get_width (_tmp25_);
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp27_ = book_view_get_x_offset (self);
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp28_ = _tmp27_;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				right_edge = (_tmp24_ + _tmp26_) - _tmp28_;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp30_ = right_edge;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp31_ = left;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (((gdouble) _tmp30_) < _tmp31_) {
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp29_ = TRUE;
+#line 2492 "book-view.c"
 				} else {
-					gint _tmp26_;
-					gdouble _tmp27_;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp26_ = left_edge;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp27_ = right;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp23_ = ((gdouble) _tmp26_) > _tmp27_;
-#line 2482 "book-view.c"
+					gint _tmp32_ = 0;
+					gdouble _tmp33_ = 0.0;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp32_ = left_edge;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp33_ = right;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp29_ = ((gdouble) _tmp32_) > _tmp33_;
+#line 2502 "book-view.c"
 				}
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp28_ = _tmp23_;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp28_) {
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp34_ = _tmp29_;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp34_) {
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_view_unref0 (page);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					continue;
-#line 2492 "book-view.c"
+#line 2512 "book-view.c"
 				}
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp29_ = context;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_save (_tmp29_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp30_ = context;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp31_ = book_view_get_x_offset (self);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_translate (_tmp30_, (gdouble) (-_tmp31_), (gdouble) 0);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp32_ = page;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp33_ = context;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_render (_tmp32_, _tmp33_);
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp34_ = context;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_restore (_tmp34_);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = page;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp36_ = page_view_get_selected (_tmp35_);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp36_) {
-#line 2520 "book-view.c"
-					GtkWidget* _tmp37_;
-					GtkStyleContext* _tmp38_ = NULL;
-					cairo_t* _tmp39_;
-					PageView* _tmp40_;
-					gint _tmp41_ = 0;
-					gint _tmp42_ = 0;
-					PageView* _tmp43_;
-					gint _tmp44_ = 0;
-					PageView* _tmp45_;
-					gint _tmp46_ = 0;
-					PageView* _tmp47_;
-					gint _tmp48_ = 0;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp37_ = self->priv->drawing_area;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp38_ = gtk_widget_get_style_context (_tmp37_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp39_ = context;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp40_ = page;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp41_ = page_view_get_x_offset (_tmp40_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp42_ = book_view_get_x_offset (self);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp43_ = page;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp44_ = page_view_get_y_offset (_tmp43_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp45_ = page;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp46_ = page_view_get_width (_tmp45_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp47_ = page;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp48_ = page_view_get_height (_tmp47_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					gtk_render_focus (_tmp38_, _tmp39_, (gdouble) (_tmp41_ - _tmp42_), (gdouble) _tmp44_, (gdouble) _tmp46_, (gdouble) _tmp48_);
-#line 2559 "book-view.c"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp35_ = context;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				cairo_save (_tmp35_);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp36_ = context;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp37_ = book_view_get_x_offset (self);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp38_ = _tmp37_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				cairo_translate (_tmp36_, (gdouble) (-_tmp38_), (gdouble) 0);
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp39_ = page;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp40_ = context;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page_view_render (_tmp39_, _tmp40_);
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp41_ = context;
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				cairo_restore (_tmp41_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp42_ = page;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp43_ = page_view_get_selected (_tmp42_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp44_ = _tmp43_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp44_) {
+#line 2544 "book-view.c"
+					GtkWidget* _tmp45_ = NULL;
+					GtkStyleContext* _tmp46_ = NULL;
+					cairo_t* _tmp47_ = NULL;
+					PageView* _tmp48_ = NULL;
+					gint _tmp49_ = 0;
+					gint _tmp50_ = 0;
+					gint _tmp51_ = 0;
+					gint _tmp52_ = 0;
+					PageView* _tmp53_ = NULL;
+					gint _tmp54_ = 0;
+					gint _tmp55_ = 0;
+					PageView* _tmp56_ = NULL;
+					gint _tmp57_ = 0;
+					PageView* _tmp58_ = NULL;
+					gint _tmp59_ = 0;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp45_ = self->priv->drawing_area;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp46_ = gtk_widget_get_style_context (_tmp45_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp47_ = context;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp48_ = page;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp49_ = page_view_get_x_offset (_tmp48_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp50_ = _tmp49_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp51_ = book_view_get_x_offset (self);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp52_ = _tmp51_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp53_ = page;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp54_ = page_view_get_y_offset (_tmp53_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp55_ = _tmp54_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp56_ = page;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp57_ = page_view_get_width (_tmp56_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp58_ = page;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp59_ = page_view_get_height (_tmp58_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					gtk_render_focus (_tmp46_, _tmp47_, (gdouble) (_tmp50_ - _tmp52_), (gdouble) _tmp55_, (gdouble) _tmp57_, (gdouble) _tmp59_);
+#line 2592 "book-view.c"
 				}
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 2563 "book-view.c"
+#line 2596 "book-view.c"
 			}
 		}
 	}
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 2571 "book-view.c"
+#line 2604 "book-view.c"
 }
 
 
@@ -2575,748 +2608,779 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 	gint _vala_x_ = 0;
 	gint _vala_y_ = 0;
 	PageView* result = NULL;
-	gint _tmp0_;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gint _tmp0_ = 0;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_y_ = 0;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = _vala_y_;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_x_ = _tmp0_;
-#line 2588 "book-view.c"
+#line 2621 "book-view.c"
 	{
-		gint i;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint i = 0;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 2593 "book-view.c"
+#line 2626 "book-view.c"
 		{
-			gboolean _tmp1_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			gboolean _tmp1_ = FALSE;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp1_ = TRUE;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 2600 "book-view.c"
-				gboolean _tmp2_;
-				gint _tmp4_;
-				Book* _tmp5_;
+#line 2633 "book-view.c"
+				gboolean _tmp2_ = FALSE;
+				gint _tmp4_ = 0;
+				Book* _tmp5_ = NULL;
 				guint _tmp6_ = 0U;
-				gint _tmp7_;
-				PageView* _tmp8_ = NULL;
-				PageView* page;
-				PageView* _tmp9_;
-				gint _tmp10_ = 0;
-				gint left;
-				gint _tmp11_;
-				PageView* _tmp12_;
+				guint _tmp7_ = 0U;
+				PageView* page = NULL;
+				gint _tmp8_ = 0;
+				PageView* _tmp9_ = NULL;
+				gint left = 0;
+				PageView* _tmp10_ = NULL;
+				gint _tmp11_ = 0;
+				gint _tmp12_ = 0;
+				gint right = 0;
 				gint _tmp13_ = 0;
-				gint right;
-				PageView* _tmp14_;
+				PageView* _tmp14_ = NULL;
 				gint _tmp15_ = 0;
-				gint top;
-				gint _tmp16_;
-				PageView* _tmp17_;
+				gint top = 0;
+				PageView* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
 				gint _tmp18_ = 0;
-				gint bottom;
-				gboolean _tmp19_ = FALSE;
-				gboolean _tmp20_ = FALSE;
-				gboolean _tmp21_ = FALSE;
-				gint _tmp22_;
-				gint _tmp23_;
-				gboolean _tmp26_;
-				gboolean _tmp29_;
-				gboolean _tmp32_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				gint bottom = 0;
+				gint _tmp19_ = 0;
+				PageView* _tmp20_ = NULL;
+				gint _tmp21_ = 0;
+				gboolean _tmp22_ = FALSE;
+				gboolean _tmp23_ = FALSE;
+				gboolean _tmp24_ = FALSE;
+				gint _tmp25_ = 0;
+				gint _tmp26_ = 0;
+				gboolean _tmp29_ = FALSE;
+				gboolean _tmp32_ = FALSE;
+				gboolean _tmp35_ = FALSE;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = _tmp1_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp2_) {
-#line 2634 "book-view.c"
-					gint _tmp3_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 2670 "book-view.c"
+					gint _tmp3_ = 0;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp3_ = i;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp3_ + 1;
-#line 2640 "book-view.c"
+#line 2676 "book-view.c"
 				}
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = FALSE;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = i;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = self->priv->book;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp5_ = self->priv->_book;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = book_get_n_pages (_tmp5_);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp4_) < _tmp6_)) {
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp7_ = _tmp6_;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (!(((guint) _tmp4_) < _tmp7_)) {
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 2654 "book-view.c"
+#line 2692 "book-view.c"
 				}
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = i;
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = book_view_get_nth_page (self, _tmp7_);
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp8_;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = page;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page_view_get_x_offset (_tmp9_);
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				left = _tmp10_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = left;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = page;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = page_view_get_width (_tmp12_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				right = _tmp11_ + _tmp13_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp8_ = i;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp9_ = book_view_get_nth_page (self, _tmp8_);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page = _tmp9_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp10_ = page;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp11_ = page_view_get_x_offset (_tmp10_);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp12_ = _tmp11_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				left = _tmp12_;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp13_ = left;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = page;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = page_view_get_y_offset (_tmp14_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				top = _tmp15_;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = top;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = page;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = page_view_get_height (_tmp17_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				bottom = _tmp16_ + _tmp18_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = x;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = left;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp22_ >= _tmp23_) {
-#line 2696 "book-view.c"
-					gint _tmp24_;
-					gint _tmp25_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp24_ = x;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp25_ = right;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp21_ = _tmp24_ <= _tmp25_;
-#line 2705 "book-view.c"
-				} else {
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp21_ = FALSE;
-#line 2709 "book-view.c"
-				}
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = _tmp21_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp26_) {
-#line 2715 "book-view.c"
-					gint _tmp27_;
-					gint _tmp28_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp27_ = y;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp28_ = top;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp20_ = _tmp27_ >= _tmp28_;
-#line 2724 "book-view.c"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp15_ = page_view_get_width (_tmp14_);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				right = _tmp13_ + _tmp15_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp16_ = page;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp17_ = page_view_get_y_offset (_tmp16_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp18_ = _tmp17_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				top = _tmp18_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp19_ = top;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp20_ = page;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp21_ = page_view_get_height (_tmp20_);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				bottom = _tmp19_ + _tmp21_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp25_ = x;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp26_ = left;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp25_ >= _tmp26_) {
+#line 2738 "book-view.c"
+					gint _tmp27_ = 0;
+					gint _tmp28_ = 0;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp27_ = x;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp28_ = right;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp24_ = _tmp27_ <= _tmp28_;
+#line 2747 "book-view.c"
 				} else {
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp20_ = FALSE;
-#line 2728 "book-view.c"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp24_ = FALSE;
+#line 2751 "book-view.c"
 				}
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp29_ = _tmp20_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp29_ = _tmp24_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp29_) {
-#line 2734 "book-view.c"
-					gint _tmp30_;
-					gint _tmp31_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 2757 "book-view.c"
+					gint _tmp30_ = 0;
+					gint _tmp31_ = 0;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp30_ = y;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp31_ = bottom;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp19_ = _tmp30_ <= _tmp31_;
-#line 2743 "book-view.c"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp31_ = top;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp23_ = _tmp30_ >= _tmp31_;
+#line 2766 "book-view.c"
 				} else {
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp19_ = FALSE;
-#line 2747 "book-view.c"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp23_ = FALSE;
+#line 2770 "book-view.c"
 				}
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp32_ = _tmp19_;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp32_ = _tmp23_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp32_) {
-#line 2753 "book-view.c"
-					gint _tmp33_;
-					gint _tmp34_;
-					gint _tmp35_;
-					gint _tmp36_;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp33_ = x;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp34_ = left;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_x_ = _tmp33_ - _tmp34_;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp35_ = y;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp36_ = top;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_y_ = _tmp35_ - _tmp36_;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 2776 "book-view.c"
+					gint _tmp33_ = 0;
+					gint _tmp34_ = 0;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp33_ = y;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp34_ = bottom;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp22_ = _tmp33_ <= _tmp34_;
+#line 2785 "book-view.c"
+				} else {
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp22_ = FALSE;
+#line 2789 "book-view.c"
+				}
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp35_ = _tmp22_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp35_) {
+#line 2795 "book-view.c"
+					gint _tmp36_ = 0;
+					gint _tmp37_ = 0;
+					gint _tmp38_ = 0;
+					gint _tmp39_ = 0;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp36_ = x;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp37_ = left;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_vala_x_ = _tmp36_ - _tmp37_;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp38_ = y;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp39_ = top;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_vala_y_ = _tmp38_ - _tmp39_;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = page;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (x_) {
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*x_ = _vala_x_;
-#line 2776 "book-view.c"
+#line 2818 "book-view.c"
 					}
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (y_) {
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*y_ = _vala_y_;
-#line 2782 "book-view.c"
+#line 2824 "book-view.c"
 					}
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
-#line 2786 "book-view.c"
+#line 2828 "book-view.c"
 				}
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 2790 "book-view.c"
+#line 2832 "book-view.c"
 			}
 		}
 	}
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = NULL;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (x_) {
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*x_ = _vala_x_;
-#line 2800 "book-view.c"
+#line 2842 "book-view.c"
 	}
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (y_) {
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*y_ = _vala_y_;
-#line 2806 "book-view.c"
+#line 2848 "book-view.c"
 	}
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 2810 "book-view.c"
+#line 2852 "book-view.c"
 }
 
 
 static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEventButton* event) {
 	gboolean result = FALSE;
-	GtkWidget* _tmp0_;
-	gint x;
-	gint y;
-	GdkEventButton _tmp1_;
-	GdkEventType _tmp2_;
-	PageView* _tmp12_;
-	GdkEventButton _tmp13_;
-	guint _tmp14_;
-	GdkEventButton _tmp29_;
-	guint _tmp30_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GtkWidget* _tmp0_ = NULL;
+	gint x = 0;
+	gint y = 0;
+	GdkEventButton _tmp1_ = {0};
+	GdkEventType _tmp2_ = 0;
+	PageView* _tmp13_ = NULL;
+	GdkEventButton _tmp14_ = {0};
+	guint _tmp15_ = 0U;
+	GdkEventButton _tmp30_ = {0};
+	guint _tmp31_ = 0U;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->drawing_area;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_grab_focus (_tmp0_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x = 0;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	y = 0;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = *event;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_.type;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == GDK_BUTTON_PRESS) {
-#line 2848 "book-view.c"
-		GdkEventButton _tmp3_;
-		gdouble _tmp4_;
+#line 2890 "book-view.c"
+		GdkEventButton _tmp3_ = {0};
+		gdouble _tmp4_ = 0.0;
 		gint _tmp5_ = 0;
-		GdkEventButton _tmp6_;
-		gdouble _tmp7_;
-		gint _tmp8_ = 0;
+		gint _tmp6_ = 0;
+		GdkEventButton _tmp7_ = {0};
+		gdouble _tmp8_ = 0.0;
 		gint _tmp9_ = 0;
-		PageView* _tmp10_ = NULL;
-		PageView* _tmp11_;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint _tmp10_ = 0;
+		PageView* _tmp11_ = NULL;
+		PageView* _tmp12_ = NULL;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = *event;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = _tmp3_.x;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = book_view_get_x_offset (self);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = *event;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = _tmp6_.y;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp10_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp5_), (gint) _tmp7_, &_tmp8_, &_tmp9_);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = _tmp8_;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = _tmp9_;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp11_ = _tmp10_;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_select_page_view (self, _tmp11_);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_page_view_unref0 (_tmp11_);
-#line 2880 "book-view.c"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp6_ = _tmp5_;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp7_ = *event;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp8_ = _tmp7_.y;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp11_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp6_), (gint) _tmp8_, &_tmp9_, &_tmp10_);
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		x = _tmp9_;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		y = _tmp10_;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp12_ = _tmp11_;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_select_page_view (self, _tmp12_);
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_page_view_unref0 (_tmp12_);
+#line 2925 "book-view.c"
 	}
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = self->priv->selected_page;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp12_ == NULL) {
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp13_ = self->priv->selected_page_view;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp13_ == NULL) {
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = FALSE;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 2890 "book-view.c"
+#line 2935 "book-view.c"
 	}
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = *event;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = _tmp13_.button;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp14_ == ((guint) 1)) {
-#line 2898 "book-view.c"
-		GdkEventButton _tmp15_;
-		GdkEventType _tmp16_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp15_ = *event;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = _tmp15_.type;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp16_ == GDK_BUTTON_PRESS) {
-#line 2907 "book-view.c"
-			PageView* _tmp17_;
-			gint _tmp18_;
-			gint _tmp19_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp17_ = self->priv->selected_page;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp18_ = x;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp19_ = y;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			page_view_button_press (_tmp17_, _tmp18_, _tmp19_);
-#line 2919 "book-view.c"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp14_ = *event;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp15_ = _tmp14_.button;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp15_ == ((guint) 1)) {
+#line 2943 "book-view.c"
+		GdkEventButton _tmp16_ = {0};
+		GdkEventType _tmp17_ = 0;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp16_ = *event;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp17_ = _tmp16_.type;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		if (_tmp17_ == GDK_BUTTON_PRESS) {
+#line 2952 "book-view.c"
+			PageView* _tmp18_ = NULL;
+			gint _tmp19_ = 0;
+			gint _tmp20_ = 0;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp18_ = self->priv->selected_page_view;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp19_ = x;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp20_ = y;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			page_view_button_press (_tmp18_, _tmp19_, _tmp20_);
+#line 2964 "book-view.c"
 		} else {
-			GdkEventButton _tmp20_;
-			GdkEventType _tmp21_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp20_ = *event;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp21_ = _tmp20_.type;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			if (_tmp21_ == GDK_BUTTON_RELEASE) {
-#line 2929 "book-view.c"
-				PageView* _tmp22_;
-				gint _tmp23_;
-				gint _tmp24_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = self->priv->selected_page;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = x;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = y;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_button_release (_tmp22_, _tmp23_, _tmp24_);
-#line 2941 "book-view.c"
+			GdkEventButton _tmp21_ = {0};
+			GdkEventType _tmp22_ = 0;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp21_ = *event;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp22_ = _tmp21_.type;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			if (_tmp22_ == GDK_BUTTON_RELEASE) {
+#line 2974 "book-view.c"
+				PageView* _tmp23_ = NULL;
+				gint _tmp24_ = 0;
+				gint _tmp25_ = 0;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp23_ = self->priv->selected_page_view;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp24_ = x;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp25_ = y;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				page_view_button_release (_tmp23_, _tmp24_, _tmp25_);
+#line 2986 "book-view.c"
 			} else {
-				GdkEventButton _tmp25_;
-				GdkEventType _tmp26_;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = *event;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = _tmp25_.type;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp26_ == GDK_2BUTTON_PRESS) {
-#line 2951 "book-view.c"
-					Page* _tmp27_ = NULL;
-					Page* _tmp28_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp27_ = book_view_get_selected (self);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp28_ = _tmp27_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					g_signal_emit_by_name (self, "show-page", _tmp28_);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_page_unref0 (_tmp28_);
-#line 2962 "book-view.c"
+				GdkEventButton _tmp26_ = {0};
+				GdkEventType _tmp27_ = 0;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp26_ = *event;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp27_ = _tmp26_.type;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				if (_tmp27_ == GDK_2BUTTON_PRESS) {
+#line 2996 "book-view.c"
+					Page* _tmp28_ = NULL;
+					Page* _tmp29_ = NULL;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp28_ = book_view_get_selected_page (self);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp29_ = _tmp28_;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					g_signal_emit_by_name (self, "show-page", _tmp29_);
+#line 3005 "book-view.c"
 				}
 			}
 		}
 	}
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp29_ = *event;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp30_ = _tmp29_.button;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp30_ == ((guint) 3)) {
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp30_ = *event;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp31_ = _tmp30_.button;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp31_ == ((guint) 3)) {
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		g_signal_emit_by_name (self, "show-menu");
-#line 2975 "book-view.c"
+#line 3018 "book-view.c"
 	}
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 2981 "book-view.c"
+#line 3024 "book-view.c"
 }
 
 
 static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 	GdkCursor* c = NULL;
-	GdkCursorType _tmp0_;
-	GdkCursorType _tmp1_;
-	GdkCursorType _tmp2_;
-	GdkCursorType _tmp3_;
-	GdkCursor* _tmp4_;
-	GtkWidget* _tmp5_;
+	GdkCursorType _tmp0_ = 0;
+	GdkCursorType _tmp1_ = 0;
+	GdkCursorType _tmp2_ = 0;
+	GdkCursorType _tmp3_ = 0;
+	GdkCursor* _tmp4_ = NULL;
+	GtkWidget* _tmp5_ = NULL;
 	GdkWindow* _tmp6_ = NULL;
-	GdkCursor* _tmp7_;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GdkCursor* _tmp7_ = NULL;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->cursor;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = cursor;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_g_object_unref0 (c);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 3007 "book-view.c"
+#line 3050 "book-view.c"
 	}
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = cursor;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = _tmp2_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = cursor;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = gdk_cursor_new (_tmp3_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	c = _tmp4_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = self->priv->drawing_area;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = c;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gdk_window_set_cursor (_tmp6_, _tmp7_);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
-#line 3031 "book-view.c"
+#line 3074 "book-view.c"
 }
 
 
 static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEventMotion* event) {
 	gboolean result = FALSE;
-	GdkCursorType cursor;
+	GdkCursorType cursor = 0;
 	gboolean _tmp0_ = FALSE;
-	PageView* _tmp1_;
-	gboolean _tmp4_;
-	GdkCursorType _tmp33_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* _tmp1_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	GdkCursorType _tmp39_ = 0;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	cursor = GDK_ARROW;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = self->priv->selected_page;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp1_ = self->priv->selected_page_view;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
-#line 3054 "book-view.c"
-		GdkEventMotion _tmp2_;
-		GdkModifierType _tmp3_;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 3097 "book-view.c"
+		GdkEventMotion _tmp2_ = {0};
+		GdkModifierType _tmp3_ = 0;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = *event;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = _tmp2_.state;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0;
-#line 3063 "book-view.c"
+#line 3106 "book-view.c"
 	} else {
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
-#line 3067 "book-view.c"
+#line 3110 "book-view.c"
 	}
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp0_;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_) {
-#line 3073 "book-view.c"
-		GdkEventMotion _tmp5_;
-		gdouble _tmp6_;
+#line 3116 "book-view.c"
+		gint x = 0;
+		GdkEventMotion _tmp5_ = {0};
+		gdouble _tmp6_ = 0.0;
 		gint _tmp7_ = 0;
-		PageView* _tmp8_;
-		gint _tmp9_ = 0;
-		gint x;
-		GdkEventMotion _tmp10_;
-		gdouble _tmp11_;
-		PageView* _tmp12_;
-		gint _tmp13_ = 0;
-		gint y;
-		PageView* _tmp14_;
-		gint _tmp15_;
-		gint _tmp16_;
-		PageView* _tmp17_;
-		GdkCursorType _tmp18_ = 0;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		gint _tmp8_ = 0;
+		PageView* _tmp9_ = NULL;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+		gint y = 0;
+		GdkEventMotion _tmp12_ = {0};
+		gdouble _tmp13_ = 0.0;
+		PageView* _tmp14_ = NULL;
+		gint _tmp15_ = 0;
+		gint _tmp16_ = 0;
+		PageView* _tmp17_ = NULL;
+		gint _tmp18_ = 0;
+		gint _tmp19_ = 0;
+		PageView* _tmp20_ = NULL;
+		GdkCursorType _tmp21_ = 0;
+		GdkCursorType _tmp22_ = 0;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = *event;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = _tmp5_.x;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = book_view_get_x_offset (self);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = self->priv->selected_page;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp9_ = page_view_get_x_offset (_tmp8_);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = (gint) ((_tmp6_ + _tmp7_) - _tmp9_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp10_ = *event;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp11_ = _tmp10_.y;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = self->priv->selected_page;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp13_ = page_view_get_y_offset (_tmp12_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = (gint) (_tmp11_ - _tmp13_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp14_ = self->priv->selected_page;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp15_ = x;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = y;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_motion (_tmp14_, _tmp15_, _tmp16_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp17_ = self->priv->selected_page;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp18_ = page_view_get_cursor (_tmp17_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		cursor = _tmp18_;
-#line 3126 "book-view.c"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp8_ = _tmp7_;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp9_ = self->priv->selected_page_view;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp10_ = page_view_get_x_offset (_tmp9_);
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp11_ = _tmp10_;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		x = (gint) ((_tmp6_ + _tmp8_) - _tmp11_);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp12_ = *event;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp13_ = _tmp12_.y;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp14_ = self->priv->selected_page_view;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp15_ = page_view_get_y_offset (_tmp14_);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp16_ = _tmp15_;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		y = (gint) (_tmp13_ - _tmp16_);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp17_ = self->priv->selected_page_view;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp18_ = x;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp19_ = y;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		page_view_motion (_tmp17_, _tmp18_, _tmp19_);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp20_ = self->priv->selected_page_view;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp21_ = page_view_get_cursor (_tmp20_);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp22_ = _tmp21_;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		cursor = _tmp22_;
+#line 3181 "book-view.c"
 	} else {
 		gint x = 0;
 		gint y = 0;
-		GdkEventMotion _tmp19_;
-		gdouble _tmp20_;
-		gint _tmp21_ = 0;
-		GdkEventMotion _tmp22_;
-		gdouble _tmp23_;
-		gint _tmp24_ = 0;
+		PageView* over_page = NULL;
+		GdkEventMotion _tmp23_ = {0};
+		gdouble _tmp24_ = 0.0;
 		gint _tmp25_ = 0;
-		PageView* _tmp26_ = NULL;
-		PageView* over_page;
-		PageView* _tmp27_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp19_ = *event;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp20_ = _tmp19_.x;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp21_ = book_view_get_x_offset (self);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp22_ = *event;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp23_ = _tmp22_.y;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp26_ = book_view_get_page_at (self, (gint) (_tmp20_ + _tmp21_), (gint) _tmp23_, &_tmp24_, &_tmp25_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = _tmp24_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = _tmp25_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		over_page = _tmp26_;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp27_ = over_page;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp27_ != NULL) {
-#line 3162 "book-view.c"
-			PageView* _tmp28_;
-			gint _tmp29_;
-			gint _tmp30_;
-			PageView* _tmp31_;
-			GdkCursorType _tmp32_ = 0;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp28_ = over_page;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp29_ = x;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp30_ = y;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			page_view_motion (_tmp28_, _tmp29_, _tmp30_);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp31_ = over_page;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp32_ = page_view_get_cursor (_tmp31_);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			cursor = _tmp32_;
-#line 3182 "book-view.c"
+		gint _tmp26_ = 0;
+		GdkEventMotion _tmp27_ = {0};
+		gdouble _tmp28_ = 0.0;
+		gint _tmp29_ = 0;
+		gint _tmp30_ = 0;
+		PageView* _tmp31_ = NULL;
+		PageView* _tmp32_ = NULL;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp23_ = *event;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp24_ = _tmp23_.x;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp25_ = book_view_get_x_offset (self);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp26_ = _tmp25_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp27_ = *event;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp28_ = _tmp27_.y;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp31_ = book_view_get_page_at (self, (gint) (_tmp24_ + _tmp26_), (gint) _tmp28_, &_tmp29_, &_tmp30_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		x = _tmp29_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		y = _tmp30_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		over_page = _tmp31_;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp32_ = over_page;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		if (_tmp32_ != NULL) {
+#line 3220 "book-view.c"
+			PageView* _tmp33_ = NULL;
+			gint _tmp34_ = 0;
+			gint _tmp35_ = 0;
+			PageView* _tmp36_ = NULL;
+			GdkCursorType _tmp37_ = 0;
+			GdkCursorType _tmp38_ = 0;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp33_ = over_page;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp34_ = x;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp35_ = y;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			page_view_motion (_tmp33_, _tmp34_, _tmp35_);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp36_ = over_page;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp37_ = page_view_get_cursor (_tmp36_);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp38_ = _tmp37_;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			cursor = _tmp38_;
+#line 3243 "book-view.c"
 		}
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (over_page);
-#line 3186 "book-view.c"
+#line 3247 "book-view.c"
 	}
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp33_ = cursor;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_cursor (self, _tmp33_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp39_ = cursor;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	book_view_set_cursor (self, _tmp39_);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3196 "book-view.c"
+#line 3257 "book-view.c"
 }
 
 
 static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey* event) {
 	gboolean result = FALSE;
-	GdkEventKey _tmp0_;
-	guint _tmp1_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GdkEventKey _tmp0_ = {0};
+	guint _tmp1_ = 0U;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = *event;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _tmp0_.keyval;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	switch (_tmp1_) {
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff50:
-#line 3218 "book-view.c"
+#line 3279 "book-view.c"
 		{
-			Book* _tmp2_;
+			Book* _tmp2_ = NULL;
 			Page* _tmp3_ = NULL;
-			Page* _tmp4_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp2_ = self->priv->book;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			Page* _tmp4_ = NULL;
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp2_ = self->priv->_book;
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp3_ = book_get_page (_tmp2_, 0);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp4_ = _tmp3_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_select_page (self, _tmp4_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			book_view_set_selected_page (self, _tmp4_);
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_unref0 (_tmp4_);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3237 "book-view.c"
+#line 3298 "book-view.c"
 		}
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff51:
-#line 3241 "book-view.c"
+#line 3302 "book-view.c"
 		{
-			PageView* _tmp5_;
+			PageView* _tmp5_ = NULL;
 			PageView* _tmp6_ = NULL;
-			PageView* _tmp7_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp5_ = self->priv->selected_page;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			PageView* _tmp7_ = NULL;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp5_ = self->priv->selected_page_view;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp6_ = book_view_get_prev_page (self, _tmp5_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp7_ = _tmp6_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page_view (self, _tmp7_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (_tmp7_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3260 "book-view.c"
+#line 3321 "book-view.c"
 		}
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff53:
-#line 3264 "book-view.c"
+#line 3325 "book-view.c"
 		{
-			PageView* _tmp8_;
+			PageView* _tmp8_ = NULL;
 			PageView* _tmp9_ = NULL;
-			PageView* _tmp10_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp8_ = self->priv->selected_page;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			PageView* _tmp10_ = NULL;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp8_ = self->priv->selected_page_view;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp9_ = book_view_get_next_page (self, _tmp8_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp10_ = _tmp9_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page_view (self, _tmp10_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (_tmp10_);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3283 "book-view.c"
+#line 3344 "book-view.c"
 		}
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xFF57:
-#line 3287 "book-view.c"
+#line 3348 "book-view.c"
 		{
-			Book* _tmp11_;
-			Book* _tmp12_;
+			Book* _tmp11_ = NULL;
+			Book* _tmp12_ = NULL;
 			guint _tmp13_ = 0U;
-			Page* _tmp14_ = NULL;
-			Page* _tmp15_;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp11_ = self->priv->book;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp12_ = self->priv->book;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			guint _tmp14_ = 0U;
+			Page* _tmp15_ = NULL;
+			Page* _tmp16_ = NULL;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp11_ = self->priv->_book;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp12_ = self->priv->_book;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp13_ = book_get_n_pages (_tmp12_);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp14_ = book_get_page (_tmp11_, ((gint) _tmp13_) - 1);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp15_ = _tmp14_;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_select_page (self, _tmp15_);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_page_unref0 (_tmp15_);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp14_ = _tmp13_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp15_ = book_get_page (_tmp11_, ((gint) _tmp14_) - 1);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_tmp16_ = _tmp15_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			book_view_set_selected_page (self, _tmp16_);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+			_page_unref0 (_tmp16_);
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3312 "book-view.c"
+#line 3376 "book-view.c"
 		}
 		default:
 		{
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = FALSE;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3320 "book-view.c"
+#line 3384 "book-view.c"
 		}
 	}
 }
@@ -3324,174 +3388,251 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 
 static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventFocus* event) {
 	gboolean result = FALSE;
-	PageView* _tmp0_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* _tmp0_ = NULL;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_selected_page (self, _tmp0_);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->selected_page_view;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	book_view_set_selected_page_view (self, _tmp0_);
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3343 "book-view.c"
+#line 3407 "book-view.c"
 }
 
 
 static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
-	gboolean _tmp0_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gboolean _tmp0_ = FALSE;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (adjustment != NULL);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->laying_out;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp0_) {
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_redraw (self);
-#line 3359 "book-view.c"
+#line 3423 "book-view.c"
 	}
 }
 
 
 void book_view_redraw (BookView* self) {
-	GtkWidget* _tmp0_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	GtkWidget* _tmp0_ = NULL;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->drawing_area;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_queue_draw (_tmp0_);
-#line 3372 "book-view.c"
-}
-
-
-void book_view_select_page (BookView* self, Page* page) {
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_;
-	Page* _tmp2_;
-	gboolean _tmp3_;
-	Page* _tmp4_;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_return_if_fail (self != NULL);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = book_view_get_selected (self);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _tmp0_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = page;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = _tmp1_ == _tmp2_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_unref0 (_tmp1_);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp3_) {
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		return;
-#line 3398 "book-view.c"
-	}
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = page;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp4_ != NULL) {
-#line 3404 "book-view.c"
-		GHashTable* _tmp5_;
-		Page* _tmp6_;
-		gconstpointer _tmp7_ = NULL;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = self->priv->page_data;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = page;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = g_hash_table_lookup (_tmp5_, _tmp6_);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_select_page_view (self, (PageView*) _tmp7_);
-#line 3416 "book-view.c"
-	} else {
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_select_page_view (self, NULL);
-#line 3420 "book-view.c"
-	}
+#line 3436 "book-view.c"
 }
 
 
 void book_view_select_next_page (BookView* self) {
-	PageView* _tmp0_;
+	PageView* _tmp0_ = NULL;
 	PageView* _tmp1_ = NULL;
-	PageView* _tmp2_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* _tmp2_ = NULL;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->selected_page_view;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_view_get_next_page (self, _tmp0_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp2_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
-#line 3441 "book-view.c"
+#line 3456 "book-view.c"
 }
 
 
 void book_view_select_prev_page (BookView* self) {
-	PageView* _tmp0_;
+	PageView* _tmp0_ = NULL;
 	PageView* _tmp1_ = NULL;
-	PageView* _tmp2_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	PageView* _tmp2_ = NULL;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->selected_page_view;
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_view_get_prev_page (self, _tmp0_);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp2_);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
-#line 3461 "book-view.c"
+#line 3476 "book-view.c"
 }
 
 
-Page* book_view_get_selected (BookView* self) {
-	Page* result = NULL;
-	PageView* _tmp0_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+Book* book_view_get_book (BookView* self) {
+	Book* result;
+	Book* _tmp0_ = NULL;
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->selected_page;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->_book;
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	result = _tmp0_;
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	return result;
+#line 3491 "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 3498 "book-view.c"
+}
+
+
+static void book_view_set_book (BookView* self, Book* value) {
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_return_if_fail (self != NULL);
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = value;
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp1_ = _book_ref0 (_tmp0_);
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_book_unref0 (self->priv->_book);
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	self->priv->_book = _tmp1_;
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_object_notify ((GObject *) self, "book");
+#line 3517 "book-view.c"
+}
+
+
+Page* book_view_get_selected_page (BookView* self) {
+	Page* result;
+	PageView* _tmp0_ = NULL;
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->selected_page_view;
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ != NULL) {
-#line 3474 "book-view.c"
-		PageView* _tmp1_;
+#line 3530 "book-view.c"
+		PageView* _tmp1_ = NULL;
 		Page* _tmp2_ = NULL;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp1_ = self->priv->selected_page;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		Page* _tmp3_ = NULL;
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp1_ = self->priv->selected_page_view;
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = page_view_get_page (_tmp1_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		result = _tmp2_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp3_ = _tmp2_;
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		result = _tmp3_;
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 3485 "book-view.c"
+#line 3544 "book-view.c"
 	} else {
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = NULL;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 3491 "book-view.c"
+#line 3550 "book-view.c"
 	}
 }
 
 
+void book_view_set_selected_page (BookView* self, Page* value) {
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_return_if_fail (self != NULL);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = book_view_get_selected_page (self);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp1_ = _tmp0_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp2_ = value;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	if (_tmp1_ == _tmp2_) {
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		return;
+#line 3572 "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 3578 "book-view.c"
+		GHashTable* _tmp4_ = NULL;
+		Page* _tmp5_ = NULL;
+		gconstpointer _tmp6_ = NULL;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp4_ = self->priv->page_data;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp5_ = value;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_select_page_view (self, (PageView*) _tmp6_);
+#line 3590 "book-view.c"
+	} else {
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_select_page_view (self, NULL);
+#line 3594 "book-view.c"
+	}
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_object_notify ((GObject *) self, "selected-page");
+#line 3598 "book-view.c"
+}
+
+
+gint book_view_get_x_offset (BookView* self) {
+	gint result;
+	GtkAdjustment* _tmp0_ = NULL;
+	gdouble _tmp1_ = 0.0;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->adjustment;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	result = (gint) _tmp1_;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	return result;
+#line 3616 "book-view.c"
+}
+
+
+void book_view_set_x_offset (BookView* self, gint value) {
+	GtkAdjustment* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_return_if_fail (self != NULL);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->adjustment;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp1_ = value;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_object_notify ((GObject *) self, "x-offset");
+#line 3633 "book-view.c"
+}
+
+
 static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
 	typedef void (*GMarshalFunc_VOID__PAGE) (gpointer data1, gpointer arg_1, gpointer data2);
 	register GMarshalFunc_VOID__PAGE callback;
@@ -3507,19 +3648,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 3511 "book-view.c"
+#line 3652 "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 3517 "book-view.c"
+#line 3658 "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 3523 "book-view.c"
+#line 3664 "book-view.c"
 }
 
 
@@ -3529,14 +3670,24 @@ static void book_view_class_init (BookViewClass * klass) {
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_type_class_add_private (klass, sizeof (BookViewPrivate));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_book_view_get_property;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_book_view_set_property;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (klass)->finalize = book_view_finalize;
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_BOOK, param_spec_book ("book", "book", "book", TYPE_BOOK, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_X_OFFSET, g_param_spec_int ("x-offset", "x-offset", "x-offset", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("page_selected", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("show_page", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
 #line 15 "/home/bob/bzr/simple-scan/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 3540 "book-view.c"
+#line 3691 "book-view.c"
 }
 
 
@@ -3544,134 +3695,134 @@ static void book_view_instance_init (BookView * self) {
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv = BOOK_VIEW_GET_PRIVATE (self);
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->selected_page = NULL;
-#line 3549 "book-view.c"
+	self->priv->selected_page_view = NULL;
+#line 3700 "book-view.c"
 }
 
 
 static void book_view_finalize (GObject* obj) {
 	BookView * self;
-	Book* _tmp0_;
+	Book* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-	Book* _tmp2_;
+	Book* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-	Book* _tmp4_;
+	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-	Book* _tmp6_;
+	Book* _tmp6_ = NULL;
 	guint _tmp7_ = 0U;
-	GtkWidget* _tmp8_;
+	GtkWidget* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-	GtkWidget* _tmp10_;
+	GtkWidget* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
-	GtkWidget* _tmp12_;
+	GtkWidget* _tmp12_ = NULL;
 	guint _tmp13_ = 0U;
-	GtkWidget* _tmp14_;
+	GtkWidget* _tmp14_ = NULL;
 	guint _tmp15_ = 0U;
-	GtkWidget* _tmp16_;
+	GtkWidget* _tmp16_ = NULL;
 	guint _tmp17_ = 0U;
-	GtkWidget* _tmp18_;
+	GtkWidget* _tmp18_ = NULL;
 	guint _tmp19_ = 0U;
-	GtkWidget* _tmp20_;
+	GtkWidget* _tmp20_ = NULL;
 	guint _tmp21_ = 0U;
-	GtkWidget* _tmp22_;
+	GtkWidget* _tmp22_ = NULL;
 	guint _tmp23_ = 0U;
-	GtkAdjustment* _tmp24_;
+	GtkAdjustment* _tmp24_ = NULL;
 	guint _tmp25_ = 0U;
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK_VIEW, BookView);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = self->priv->book;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp0_ = self->priv->_book;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_view_add_cb_book_page_added, self);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = self->priv->book;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp2_ = self->priv->_book;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_view_remove_cb_book_page_removed, self);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = self->priv->book;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp4_ = self->priv->_book;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_view_reorder_cb_book_reordered, self);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = self->priv->book;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp6_ = self->priv->_book;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp7_, NULL, FALSE);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _book_view_clear_cb_book_cleared, self);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->drawing_area;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("configure-event", GTK_TYPE_WIDGET, &_tmp9_, NULL, FALSE);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = self->priv->drawing_area;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("draw", GTK_TYPE_WIDGET, &_tmp11_, NULL, FALSE);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _book_view_draw_cb_gtk_widget_draw, self);
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->drawing_area;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("motion-notify-event", GTK_TYPE_WIDGET, &_tmp13_, NULL, FALSE);
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = self->priv->drawing_area;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("key-press-event", GTK_TYPE_WIDGET, &_tmp15_, NULL, FALSE);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = self->priv->drawing_area;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("button-press-event", GTK_TYPE_WIDGET, &_tmp17_, NULL, FALSE);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = self->priv->drawing_area;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("button-release-event", GTK_TYPE_WIDGET, &_tmp19_, NULL, FALSE);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = self->priv->drawing_area;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("focus-in-event", GTK_TYPE_WIDGET, &_tmp21_, NULL, FALSE);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self);
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = self->priv->drawing_area;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("focus-out-event", GTK_TYPE_WIDGET, &_tmp23_, NULL, FALSE);
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->adjustment;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("value-changed", GTK_TYPE_ADJUSTMENT, &_tmp25_, NULL, FALSE);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self);
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_book_unref0 (self->priv->book);
+	_book_unref0 (self->priv->_book);
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_view_unref0 (self->priv->selected_page);
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_page_view_unref0 (self->priv->selected_page_view);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->adjustment);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (book_view_parent_class)->finalize (obj);
-#line 3675 "book-view.c"
+#line 3826 "book-view.c"
 }
 
 
@@ -3680,11 +3831,79 @@ GType book_view_get_type (void) {
 	if (g_once_init_enter (&book_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (BookViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) book_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BookView), 0, (GInstanceInitFunc) book_view_instance_init, NULL };
 		GType book_view_type_id;
-		book_view_type_id = g_type_register_static (GTK_TYPE_VBOX, "BookView", &g_define_type_info, 0);
+		book_view_type_id = g_type_register_static (GTK_TYPE_BOX, "BookView", &g_define_type_info, 0);
 		g_once_init_leave (&book_view_type_id__volatile, book_view_type_id);
 	}
 	return book_view_type_id__volatile;
 }
 
 
+static void _vala_book_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	BookView * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_BOOK_VIEW, BookView);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	switch (property_id) {
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		case BOOK_VIEW_BOOK:
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		value_set_book (value, book_view_get_book (self));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		break;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		case BOOK_VIEW_SELECTED_PAGE:
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		value_set_page (value, book_view_get_selected_page (self));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		break;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		case BOOK_VIEW_X_OFFSET:
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		g_value_set_int (value, book_view_get_x_offset (self));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		break;
+#line 3865 "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 3871 "book-view.c"
+	}
+}
+
+
+static void _vala_book_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	BookView * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_BOOK_VIEW, BookView);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	switch (property_id) {
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		case BOOK_VIEW_BOOK:
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_set_book (self, value_get_book (value));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		break;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		case BOOK_VIEW_SELECTED_PAGE:
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_set_selected_page (self, value_get_page (value));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		break;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		case BOOK_VIEW_X_OFFSET:
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		book_view_set_x_offset (self, g_value_get_int (value));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+		break;
+#line 3899 "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 3905 "book-view.c"
+	}
+}
+
+
 
diff --git a/src/book-view.vala b/src/book-view.vala
index 4796ec1..833e723 100644
--- a/src/book-view.vala
+++ b/src/book-view.vala
@@ -12,10 +12,10 @@
 // FIXME: When scrolling, copy existing render sideways?
 // FIXME: Only render pages that change and only the part that changed
 
-public class BookView : Gtk.VBox
+public class BookView : Gtk.Box
 {
     /* Book being rendered */
-    private Book book;
+    public Book book { get; private set; }
     private HashTable<Page, PageView> page_data;
 
     /* True if the view needs to be laid out again */
@@ -24,7 +24,27 @@ public class BookView : Gtk.VBox
     private bool show_selected_page;
 
     /* Currently selected page */
-    private PageView? selected_page = null;
+    private PageView? selected_page_view = null;
+    public Page? selected_page
+    {
+        get
+        {
+            if (selected_page_view != null)
+                return selected_page_view.page;
+            else
+                return null;
+        }
+        set 
+        {
+            if (selected_page == value)
+                return;
+
+            if (value != null)
+                select_page_view (page_data.lookup (value));
+            else
+                select_page_view (null);
+        }
+    }
 
     /* Widget being rendered to */
     private Gtk.Widget drawing_area;
@@ -39,18 +59,31 @@ public class BookView : Gtk.VBox
     public signal void show_page (Page page);
     public signal void show_menu ();
 
+    public int x_offset
+    {
+        get
+        {
+            return (int) adjustment.get_value ();
+        }
+        set
+        {
+            adjustment.set_value (value);
+        }
+    }
+
     public BookView (Book book)
     {
+        GLib.Object (orientation: Gtk.Orientation.VERTICAL);
         this.book = book;
 
         /* Load existing pages */
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             Page page = book.get_page (i);
             add_cb (book, page);
         }
 
-        select_page (book.get_page (0));
+        selected_page = book.get_page (0);
 
         /* Watch for new pages */
         book.page_added.connect (add_cb);
@@ -115,7 +148,7 @@ public class BookView : Gtk.VBox
             var p = book.get_page (i);
             if (p == null)
                 break;
-            if (p == page.get_page ())
+            if (p == page.page)
             {
                 p = book.get_page (i + 1);
                 if (p != null)
@@ -134,7 +167,7 @@ public class BookView : Gtk.VBox
             var p = book.get_page (i);
             if (p == null)
                 break;
-            if (p == page.get_page ())
+            if (p == page.page)
                 return prev_page;
             prev_page = page_data.lookup (p);
         }
@@ -163,31 +196,21 @@ public class BookView : Gtk.VBox
         redraw ();
     }
 
-    private void set_selected_page (PageView? page)
+    private void set_selected_page_view (PageView? page)
     {
         /* Deselect existing page if changed */
-        if (selected_page != null && page != selected_page)
-            selected_page.set_selected (false);
+        if (selected_page_view != null && page != selected_page_view)
+            selected_page_view.selected = true;
 
-        selected_page = page;
-        if (selected_page == null)
+        selected_page_view = page;
+        if (selected_page_view == null)
             return;
 
         /* Select new page if widget has focus */
         if (!drawing_area.has_focus)
-            selected_page.set_selected (false);
+            selected_page_view.selected = false;
         else
-            selected_page.set_selected (true);
-    }
-
-    private void set_x_offset (int offset)
-    {
-        adjustment.set_value (offset);
-    }
-
-    private int get_x_offset ()
-    {
-        return (int) adjustment.get_value ();
+            selected_page_view.selected = true;
     }
 
     private void show_page_view (PageView? page)
@@ -197,23 +220,23 @@ public class BookView : Gtk.VBox
 
         Gtk.Allocation allocation;
         drawing_area.get_allocation (out allocation);
-        var left_edge = page.get_x_offset ();
-        var right_edge = page.get_x_offset () + page.get_width ();
+        var left_edge = page.x_offset;
+        var right_edge = page.x_offset + page.get_width ();
 
-        if (left_edge - get_x_offset () < 0)
-            set_x_offset (left_edge);
-        else if (right_edge - get_x_offset () > allocation.width)
-            set_x_offset (right_edge - allocation.width);
+        if (left_edge - x_offset < 0)
+            x_offset = left_edge;
+        else if (right_edge - x_offset > allocation.width)
+            x_offset = right_edge - allocation.width;
     }
 
     private void select_page_view (PageView? page)
     {
         Page? p = null;
 
-        if (selected_page == page)
+        if (selected_page_view == page)
             return;
 
-        set_selected_page (page);
+        set_selected_page_view (page);
 
         if (need_layout)
             show_selected_page = true;
@@ -221,21 +244,21 @@ public class BookView : Gtk.VBox
             show_page_view (page);
 
         if (page != null)
-            p = page.get_page ();
+            p = page.page;
         page_selected (p);
     }
 
     private void remove_cb (Book book, Page page)
     {
-        PageView new_selection = selected_page;
+        PageView new_selection = selected_page_view;
 
         /* Select previous page or next if removing the selected page */
-        if (page == get_selected ())
+        if (page == selected_page)
         {
-            new_selection = get_prev_page (selected_page);
-            if (new_selection == selected_page)
-                new_selection = get_next_page (selected_page);
-            selected_page = null;
+            new_selection = get_prev_page (selected_page_view);
+            if (new_selection == selected_page_view)
+                new_selection = get_next_page (selected_page_view);
+            selected_page_view = null;
         }
 
         var page_view = page_data.lookup (page);
@@ -258,17 +281,12 @@ public class BookView : Gtk.VBox
     private void clear_cb (Book book)
     {
         page_data.remove_all ();
-        selected_page = null;
+        selected_page_view = null;
         page_selected (null);
         need_layout = true;
         redraw ();
     }
 
-    public Book get_book ()
-    {
-        return book;
-    }
-
     private bool configure_cb (Gtk.Widget widget, Gdk.EventConfigure event)
     {
         need_layout = true;
@@ -279,24 +297,24 @@ public class BookView : Gtk.VBox
     {
         /* Get maximum page resolution */
         int max_dpi = 0;
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             var page = book.get_page (i);
-            if (page.get_dpi () > max_dpi)
-                max_dpi = page.get_dpi ();
+            if (page.dpi > max_dpi)
+                max_dpi = page.dpi;
         }
 
         /* Get area required to fit all pages */
         int max_width = 0, max_height = 0;
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             var page = book.get_page (i);
-            var w = page.get_width ();
-            var h = page.get_height ();
+            var w = page.width;
+            var h = page.height;
 
             /* Scale to the same DPI */
-            w = (int) ((double)w * max_dpi / page.get_dpi () + 0.5);
-            h = (int) ((double)h * max_dpi / page.get_dpi () + 0.5);
+            w = (int) ((double)w * max_dpi / page.dpi + 0.5);
+            h = (int) ((double)h * max_dpi / page.dpi + 0.5);
 
             if (w > max_width)
                 max_width = w;
@@ -311,22 +329,22 @@ public class BookView : Gtk.VBox
         int spacing = 12;
         book_width = 0;
         book_height = 0;
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             var page = get_nth_page (i);
-            var p = page.get_page ();
+            var p = page.page;
 
             /* NOTE: Using double to avoid overflow for large images */
             if (max_aspect > aspect)
             {
                 /* Set width scaled on DPI and maximum width */
-                int w = (int) ((double)p.get_width () * max_dpi * width / (p.get_dpi () * max_width));
+                int w = (int) ((double)p.width * max_dpi * width / (p.dpi * max_width));
                 page.set_width (w);
             }
             else
             {
                 /* Set height scaled on DPI and maximum height */
-                int h = (int) ((double)p.get_height () * max_dpi * height / (p.get_dpi () * max_height));
+                int h = (int) ((double)p.height * max_dpi * height / (p.dpi * max_height));
                 page.set_height (h);
             }
 
@@ -339,16 +357,16 @@ public class BookView : Gtk.VBox
         }
 
         int x_offset = 0;
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             var page = get_nth_page (i);
 
             /* Layout pages left to right */
-            page.set_x_offset (x_offset);
+            page.x_offset = x_offset;
             x_offset += page.get_width () + spacing;
 
             /* Centre page vertically */
-            page.set_y_offset ((height - page.get_height ()) / 2);
+            page.y_offset = (height - page.get_height ()) / 2;
         }
     }
 
@@ -389,8 +407,8 @@ public class BookView : Gtk.VBox
 
             /* Keep right-aligned */
             var max_offset = book_width - allocation.width;
-            if (right_aligned || get_x_offset () > max_offset)
-                set_x_offset(max_offset);
+            if (right_aligned || x_offset > max_offset)
+                x_offset = max_offset;
 
             scroll.show ();
         }
@@ -401,11 +419,11 @@ public class BookView : Gtk.VBox
             adjustment.set_lower (offset);
             adjustment.set_upper (offset);
             adjustment.set_page_size (0);
-            set_x_offset (offset);
+            x_offset = offset;
         }
 
         if (show_selected_page)
-           show_page_view (selected_page);
+           show_page_view (selected_page_view);
 
         need_layout = false;
         show_selected_page = false;
@@ -414,7 +432,7 @@ public class BookView : Gtk.VBox
 
     private bool draw_cb (Gtk.Widget widget, Cairo.Context context)
     {
-        if (book.get_n_pages () == 0)
+        if (book.n_pages == 0)
             return false;
 
         layout ();
@@ -423,25 +441,25 @@ public class BookView : Gtk.VBox
         context.clip_extents (out left, out top, out right, out bottom);
 
         /* Render each page */
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             var page = get_nth_page (i);
-            var left_edge = page.get_x_offset () - get_x_offset ();
-            var right_edge = page.get_x_offset () + page.get_width () - get_x_offset ();
+            var left_edge = page.x_offset - x_offset;
+            var right_edge = page.x_offset + page.get_width () - x_offset;
 
             /* Page not visible, don't render */
             if (right_edge < left || left_edge > right)
                 continue;
 
             context.save ();
-            context.translate (-get_x_offset (), 0);
+            context.translate (-x_offset, 0);
             page.render (context);
             context.restore ();
 
-            if (page.get_selected ())
+            if (page.selected)
                 drawing_area.get_style_context ().render_focus (context,
-                                                                page.get_x_offset () - get_x_offset (),
-                                                                page.get_y_offset (),
+                                                                page.x_offset - x_offset,
+                                                                page.y_offset,
                                                                 page.get_width (),
                                                                 page.get_height ());
         }
@@ -452,12 +470,12 @@ public class BookView : Gtk.VBox
     private PageView? get_page_at (int x, int y, out int x_, out int y_)
     {
         x_ = y_ = 0;
-        for (var i = 0; i < book.get_n_pages (); i++)
+        for (var i = 0; i < book.n_pages; i++)
         {
             var page = get_nth_page (i);
-            var left = page.get_x_offset ();
+            var left = page.x_offset;
             var right = left + page.get_width ();
-            var top = page.get_y_offset ();
+            var top = page.y_offset;
             var bottom = top + page.get_height ();
             if (x >= left && x <= right && y >= top && y <= bottom)
             {
@@ -478,20 +496,20 @@ public class BookView : Gtk.VBox
 
         int x = 0, y = 0;
         if (event.type == Gdk.EventType.BUTTON_PRESS)
-            select_page_view (get_page_at ((int) (event.x + get_x_offset ()), (int) event.y, out x, out y));
+            select_page_view (get_page_at ((int) (event.x + x_offset), (int) event.y, out x, out y));
 
-        if (selected_page == null)
+        if (selected_page_view == null)
             return false;
 
         /* Modify page */
         if (event.button == 1)
         {
             if (event.type == Gdk.EventType.BUTTON_PRESS)
-                selected_page.button_press (x, y);
+                selected_page_view.button_press (x, y);
             else if (event.type == Gdk.EventType.BUTTON_RELEASE)
-                selected_page.button_release (x, y);
+                selected_page_view.button_release (x, y);
             else if (event.type == Gdk.EventType.2BUTTON_PRESS)
-                show_page (get_selected ());
+                show_page (selected_page);
         }
 
         /* Show pop-up menu on right click */
@@ -518,21 +536,21 @@ public class BookView : Gtk.VBox
         Gdk.CursorType cursor = Gdk.CursorType.ARROW;
 
         /* Dragging */
-        if (selected_page != null && (event.state & Gdk.ModifierType.BUTTON1_MASK) != 0)
+        if (selected_page_view != null && (event.state & Gdk.ModifierType.BUTTON1_MASK) != 0)
         {
-            var x = (int) (event.x + get_x_offset () - selected_page.get_x_offset ());
-            var y = (int) (event.y - selected_page.get_y_offset ());
-            selected_page.motion (x, y);
-            cursor = selected_page.get_cursor ();
+            var x = (int) (event.x + x_offset - selected_page_view.x_offset);
+            var y = (int) (event.y - selected_page_view.y_offset);
+            selected_page_view.motion (x, y);
+            cursor = selected_page_view.cursor;
         }
         else
         {
             int x, y;
-            var over_page = get_page_at ((int) (event.x + get_x_offset ()), (int) event.y, out x, out y);
+            var over_page = get_page_at ((int) (event.x + x_offset), (int) event.y, out x, out y);
             if (over_page != null)
             {
                 over_page.motion (x, y);
-                cursor = over_page.get_cursor ();
+                cursor = over_page.cursor;
             }
         }
 
@@ -546,16 +564,16 @@ public class BookView : Gtk.VBox
         switch (event.keyval)
         {
         case 0xff50: /* FIXME: GDK_Home */
-            select_page (book.get_page (0));
+            selected_page = book.get_page (0);
             return true;
         case 0xff51: /* FIXME: GDK_Left */
-            select_page_view (get_prev_page (selected_page));
+            select_page_view (get_prev_page (selected_page_view));
             return true;
         case 0xff53: /* FIXME: GDK_Right */
-            select_page_view (get_next_page (selected_page));
+            select_page_view (get_next_page (selected_page_view));
             return true;
         case 0xFF57: /* FIXME: GDK_End */
-            select_page (book.get_page ((int) book.get_n_pages () - 1));
+            selected_page = book.get_page ((int) book.n_pages - 1);
             return true;
 
         default:
@@ -565,7 +583,7 @@ public class BookView : Gtk.VBox
 
     private bool focus_cb (Gtk.Widget widget, Gdk.EventFocus event)
     {
-        set_selected_page (selected_page);
+        set_selected_page_view (selected_page_view);
         return false;
     }
 
@@ -580,32 +598,13 @@ public class BookView : Gtk.VBox
         drawing_area.queue_draw ();
     }
 
-    public void select_page (Page? page)
-    {
-        if (get_selected () == page)
-            return;
-
-        if (page != null)
-            select_page_view (page_data.lookup (page));
-        else
-            select_page_view (null);
-    }
-
     public void select_next_page ()
     {
-        select_page_view (get_next_page (selected_page));
+        select_page_view (get_next_page (selected_page_view));
     }
 
     public void select_prev_page ()
     {
-        select_page_view (get_prev_page (selected_page));
-    }
-
-    public Page? get_selected ()
-    {
-        if (selected_page != null)
-            return selected_page.get_page ();
-        else
-            return null;
+        select_page_view (get_prev_page (selected_page_view));
     }
 }
diff --git a/src/book.c b/src/book.c
index b9e4dbb..def1bd0 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.20.1, the Vala compiler
+/* book.c generated by valac 0.22.1, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -50,8 +50,6 @@ typedef struct _PageClass PageClass;
 #define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
 #define __g_list_free__page_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__page_unref0_ (var), NULL)))
 #define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
-
-#define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
@@ -99,17 +97,10 @@ struct _BookClass {
 
 struct _BookPrivate {
 	GList* pages;
-	gboolean needs_saving;
+	gboolean needs_saving_;
 	GByteArray* jpeg_data;
 };
 
-typedef enum  {
-	SCAN_DIRECTION_TOP_TO_BOTTOM,
-	SCAN_DIRECTION_LEFT_TO_RIGHT,
-	SCAN_DIRECTION_BOTTOM_TO_TOP,
-	SCAN_DIRECTION_RIGHT_TO_LEFT
-} ScanDirection;
-
 struct _PsWriter {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -183,23 +174,18 @@ static void _g_list_free__page_unref0_ (GList* self);
 Book* book_new (void);
 Book* book_construct (GType object_type);
 void book_clear (Book* self);
-void book_set_needs_saving (Book* self, gboolean needs_saving);
-GType scan_direction_get_type (void) G_GNUC_CONST;
-Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction);
-Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
-Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
+void book_set_needs_saving (Book* self, gboolean value);
+void book_append_page (Book* self, Page* page);
 void book_move_page (Book* self, Page* page, guint location);
 void book_delete_page (Book* self, Page* page);
-guint book_get_n_pages (Book* self);
 Page* book_get_page (Book* self, gint page_number);
 guint book_get_page_index (Book* self, Page* page);
 static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i);
+guint book_get_n_pages (Book* self);
 static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkPixbuf* image, gdouble dpi);
 static void book_save_ps (Book* self, GFile* file, GError** error);
-PsWriter* ps_writer_new (GFileOutputStream* stream);
-PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream);
 gpointer ps_writer_ref (gpointer instance);
 void ps_writer_unref (gpointer instance);
 GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -207,6 +193,8 @@ void value_set_ps_writer (GValue* value, gpointer v_object);
 void value_take_ps_writer (GValue* value, gpointer v_object);
 gpointer value_get_ps_writer (const GValue* value);
 GType ps_writer_get_type (void) G_GNUC_CONST;
+PsWriter* ps_writer_new (GFileOutputStream* stream);
+PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream);
 GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
 gint page_get_dpi (Page* self);
 static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, int* result_length1);
@@ -214,8 +202,6 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1, GError** error);
 static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self);
 static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error);
-PDFWriter* pdf_writer_new (GFileOutputStream* stream);
-PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream);
 gpointer pdf_writer_ref (gpointer instance);
 void pdf_writer_unref (gpointer instance);
 GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -223,9 +209,11 @@ void value_set_pdf_writer (GValue* value, gpointer v_object);
 void value_take_pdf_writer (GValue* value, gpointer v_object);
 gpointer value_get_pdf_writer (const GValue* value);
 GType pdf_writer_get_type (void) G_GNUC_CONST;
+PDFWriter* pdf_writer_new (GFileOutputStream* stream);
+PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream);
 void pdf_writer_write_string (PDFWriter* self, const gchar* text);
 guint pdf_writer_start_object (PDFWriter* self);
-gboolean page_is_color (Page* self);
+gboolean page_get_is_color (Page* self);
 gint page_get_depth (Page* self);
 static guint8* _vala_array_dup1 (guint8* self, int length);
 static guint8* _vala_array_dup2 (guint8* self, int length);
@@ -250,30 +238,30 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? page_ref (self) : NULL;
-#line 256 "book.c"
+#line 244 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_page_changed_cb (self, _sender);
-#line 263 "book.c"
+#line 251 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_page_changed_cb (self, _sender);
-#line 270 "book.c"
+#line 258 "book.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
-#line 277 "book.c"
+#line 265 "book.c"
 }
 
 
@@ -282,145 +270,103 @@ static void _g_list_free__page_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _page_unref0_, NULL);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_free (self);
-#line 286 "book.c"
+#line 274 "book.c"
 }
 
 
 Book* book_construct (GType object_type) {
 	Book* self = NULL;
-#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (Book*) g_type_create_instance (object_type);
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = NULL;
-#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 300 "book.c"
+#line 288 "book.c"
 }
 
 
 Book* book_new (void) {
-#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return book_construct (TYPE_BOOK);
-#line 307 "book.c"
+#line 295 "book.c"
 }
 
 
 void book_clear (Book* self) {
-	GList* _tmp0_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	GList* _tmp0_ = NULL;
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 317 "book.c"
+#line 305 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 325 "book.c"
-			Page* _tmp1_;
+#line 313 "book.c"
+			Page* _tmp1_ = NULL;
 			Page* page = NULL;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
-#line 332 "book.c"
+#line 320 "book.c"
 			{
-				Page* _tmp2_;
+				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
-				Page* _tmp4_;
+				Page* _tmp4_ = NULL;
 				guint _tmp5_ = 0U;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = page;
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 352 "book.c"
+#line 340 "book.c"
 			}
 		}
 	}
-#line 46 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 46 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = NULL;
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "cleared");
-#line 362 "book.c"
+#line 350 "book.c"
 }
 
 
 static void book_page_changed_cb (Book* self, Page* page) {
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (page != NULL);
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 373 "book.c"
-}
-
-
-Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction) {
-	Page* result = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	ScanDirection _tmp3_;
-	Page* _tmp4_;
-	Page* page;
-	Page* _tmp5_;
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = width;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = height;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = dpi;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = scan_direction;
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	page = _tmp4_;
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_connect (page, "pixels-changed", (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_connect (page, "crop-changed", (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = _page_ref0 (page);
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_append (self->priv->pages, _tmp5_);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "page-added", page);
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_set_needs_saving (self, TRUE);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = page;
+	g_return_if_fail (page != NULL);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 416 "book.c"
+	book_set_needs_saving (self, TRUE);
+#line 361 "book.c"
 }
 
 
-void book_move_page (Book* self, Page* page, guint location) {
-	Page* _tmp0_;
-	Page* _tmp1_;
-	Page* _tmp2_;
-	guint _tmp3_;
+void book_append_page (Book* self, Page* page) {
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -428,633 +374,657 @@ void book_move_page (Book* self, Page* page, guint location) {
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_remove (self->priv->pages, _tmp0_);
+	g_signal_connect (_tmp0_, "pixels-changed", (GCallback) _book_page_changed_cb_page_pixels_changed, self);
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _book_page_changed_cb_page_crop_changed, self);
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp2_ = page;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp3_ = _page_ref0 (_tmp2_);
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->pages = g_list_append (self->priv->pages, _tmp3_);
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp4_ = page;
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_emit_by_name (self, "page-added", _tmp4_);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	book_set_needs_saving (self, TRUE);
+#line 395 "book.c"
+}
+
+
+void book_move_page (Book* self, Page* page, guint location) {
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_if_fail (self != NULL);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_if_fail (page != NULL);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = page;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->pages = g_list_remove (self->priv->pages, _tmp0_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1_ = page;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = _page_ref0 (_tmp1_);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = location;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_insert (self->priv->pages, _tmp2_, (gint) _tmp3_);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "reordered");
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 445 "book.c"
+#line 424 "book.c"
 }
 
 
 void book_delete_page (Book* self, Page* page) {
-	Page* _tmp0_;
+	Page* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-	Page* _tmp2_;
+	Page* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-	Page* _tmp4_;
-	Page* _tmp5_;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = page;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = page;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "page-removed", _tmp4_);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_remove (self->priv->pages, _tmp5_);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 482 "book.c"
-}
-
-
-guint book_get_n_pages (Book* self) {
-	guint result = 0U;
-	GList* _tmp0_;
-	guint _tmp1_ = 0U;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_val_if_fail (self != NULL, 0U);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->pages;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = g_list_length (_tmp0_);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp1_;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	return result;
-#line 500 "book.c"
+#line 461 "book.c"
 }
 
 
 Page* book_get_page (Book* self, gint page_number) {
 	Page* result = NULL;
-	gint _tmp0_;
-	GList* _tmp4_;
-	gint _tmp5_;
+	gint _tmp0_ = 0;
+	GList* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
 	gconstpointer _tmp6_ = NULL;
-	Page* _tmp7_;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	Page* _tmp7_ = NULL;
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page_number;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ < 0) {
-#line 517 "book.c"
-		GList* _tmp1_;
+#line 478 "book.c"
+		GList* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
-		gint _tmp3_;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		gint _tmp3_ = 0;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = self->priv->pages;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = g_list_length (_tmp1_);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = page_number;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_number = ((gint) _tmp2_) + _tmp3_;
-#line 529 "book.c"
+#line 490 "book.c"
 	}
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->priv->pages;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page_number;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = g_list_nth_data (_tmp4_, (guint) _tmp5_);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = _page_ref0 ((Page*) _tmp6_);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp7_;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 543 "book.c"
+#line 504 "book.c"
 }
 
 
 guint book_get_page_index (Book* self, Page* page) {
 	guint result = 0U;
-	GList* _tmp0_;
-	Page* _tmp1_;
+	GList* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (page != NULL, 0U);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_index (_tmp0_, _tmp1_);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = (guint) _tmp2_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 566 "book.c"
+#line 527 "book.c"
 }
 
 
 static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
-	gint _tmp0_;
-	gunichar _tmp1_;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
-	gchar* _result_;
-	gchar* _tmp3_;
-#line 928 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	gchar* _tmp3_ = NULL;
+#line 928 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 591 "book.c"
-		gchar* _tmp4_;
-#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 552 "book.c"
+		gchar* _tmp4_ = NULL;
+#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 599 "book.c"
+#line 560 "book.c"
 	} else {
-#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = -1;
-#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 605 "book.c"
+#line 566 "book.c"
 	}
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
-	glong string_length;
-	glong _tmp2_;
-	glong _tmp5_;
+	glong string_length = 0L;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	glong _tmp2_ = 0L;
+	glong _tmp5_ = 0L;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_;
-	gboolean _tmp12_;
+	glong _tmp9_ = 0L;
+	gboolean _tmp12_ = FALSE;
 	gboolean _tmp13_ = FALSE;
-	glong _tmp14_;
-	gboolean _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	glong _tmp22_;
+	glong _tmp14_ = 0L;
+	gboolean _tmp17_ = FALSE;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	glong _tmp22_ = 0L;
 	gchar* _tmp23_ = NULL;
-#line 1190 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1189 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 641 "book.c"
-		glong _tmp3_;
-		glong _tmp4_;
-#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 602 "book.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 650 "book.c"
+#line 611 "book.c"
 	}
-#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 656 "book.c"
-		glong _tmp6_;
-		glong _tmp7_;
-#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 617 "book.c"
+		glong _tmp6_ = 0L;
+		glong _tmp7_ = 0L;
+#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 665 "book.c"
+#line 626 "book.c"
 	}
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 671 "book.c"
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 632 "book.c"
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 680 "book.c"
+#line 641 "book.c"
 	} else {
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 684 "book.c"
+#line 645 "book.c"
 	}
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp12_ = _tmp8_;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp14_ = end;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp14_ >= ((glong) 0)) {
-#line 694 "book.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 655 "book.c"
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp15_ = end;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp13_ = _tmp15_ <= _tmp16_;
-#line 703 "book.c"
+#line 664 "book.c"
 	} else {
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp13_ = FALSE;
-#line 707 "book.c"
+#line 668 "book.c"
 	}
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp17_ = _tmp13_;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp17_, NULL);
-#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp21_ = end;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp22_ = start;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp23_;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 731 "book.c"
+#line 692 "book.c"
 }
 
 
 static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	GFile* result = NULL;
 	guint _tmp0_ = 0U;
-	const gchar* _tmp3_;
-	gchar* _tmp4_ = NULL;
-	gchar* basename;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* prefix;
-	gchar* _tmp7_;
-	gchar* suffix;
-	const gchar* _tmp8_;
-	gint _tmp9_ = 0;
-	gint extension_index;
-	gint _tmp10_;
-	guint _tmp25_ = 0U;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_;
-	gint _tmp28_;
-	gint _tmp29_;
-	gint _tmp30_;
-	gint width;
-	gint _tmp31_;
-	gchar* _tmp32_ = NULL;
-	gchar* number_format;
-	const gchar* _tmp33_;
-	gchar* _tmp34_;
-	gchar* _tmp35_;
-	const gchar* _tmp36_;
-	gint _tmp37_;
-	gchar* _tmp38_ = NULL;
-	gchar* _tmp39_;
-	gchar* _tmp40_;
-	gchar* _tmp41_;
-	const gchar* _tmp42_;
-	gchar* _tmp43_;
-	gchar* _tmp44_;
-	gchar* filename;
-	const gchar* _tmp45_;
-	GFile* _tmp46_ = NULL;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	guint _tmp1_ = 0U;
+	gchar* basename = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* prefix = NULL;
+	const gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	gchar* suffix = NULL;
+	gchar* _tmp8_ = NULL;
+	gint extension_index = 0;
+	const gchar* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	gint width = 0;
+	guint _tmp26_ = 0U;
+	guint _tmp27_ = 0U;
+	gchar* _tmp28_ = NULL;
+	gchar* _tmp29_ = NULL;
+	gint _tmp30_ = 0;
+	gint _tmp31_ = 0;
+	gint _tmp32_ = 0;
+	gchar* number_format = NULL;
+	gint _tmp33_ = 0;
+	gchar* _tmp34_ = NULL;
+	gchar* filename = NULL;
+	const gchar* _tmp35_ = NULL;
+	gchar* _tmp36_ = NULL;
+	gchar* _tmp37_ = NULL;
+	const gchar* _tmp38_ = NULL;
+	gint _tmp39_ = 0;
+	gchar* _tmp40_ = NULL;
+	gchar* _tmp41_ = NULL;
+	gchar* _tmp42_ = NULL;
+	gchar* _tmp43_ = NULL;
+	const gchar* _tmp44_ = NULL;
+	gchar* _tmp45_ = NULL;
+	gchar* _tmp46_ = NULL;
+	const gchar* _tmp47_ = NULL;
+	GFile* _tmp48_ = NULL;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = book_get_n_pages (self);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp0_ == ((guint) 1)) {
-#line 783 "book.c"
-		const gchar* _tmp1_;
-		GFile* _tmp2_ = NULL;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp1_ = uri;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp2_ = g_file_new_for_uri (_tmp1_);
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		result = _tmp2_;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		return result;
-#line 794 "book.c"
-	}
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = uri;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = g_path_get_basename (_tmp3_);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	basename = _tmp4_;
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = uri;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	prefix = _tmp6_;
+	_tmp0_ = book_get_n_pages (self);
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp7_ = g_strdup ("");
+	_tmp1_ = _tmp0_;
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	suffix = _tmp7_;
+	if (_tmp1_ == ((guint) 1)) {
+#line 748 "book.c"
+		const gchar* _tmp2_ = NULL;
+		GFile* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp8_ = basename;
+		_tmp2_ = uri;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp9_ = string_last_index_of_char (_tmp8_, (gunichar) '.', 0);
+		_tmp3_ = g_file_new_for_uri (_tmp2_);
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	extension_index = _tmp9_;
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10_ = extension_index;
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp10_ >= 0) {
-#line 822 "book.c"
-		const gchar* _tmp11_;
-		gint _tmp12_;
-		const gchar* _tmp13_;
-		gint _tmp14_;
-		gint _tmp15_;
-		gchar* _tmp16_ = NULL;
-		const gchar* _tmp17_;
-		const gchar* _tmp18_;
-		gint _tmp19_;
-		gint _tmp20_;
-		const gchar* _tmp21_;
-		gint _tmp22_;
-		gint _tmp23_;
-		gchar* _tmp24_ = NULL;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp11_ = basename;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp12_ = extension_index;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp13_ = basename;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp14_ = strlen (_tmp13_);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp15_ = _tmp14_;
+		result = _tmp3_;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		return result;
+#line 759 "book.c"
+	}
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp16_ = string_slice (_tmp11_, (glong) _tmp12_, (glong) _tmp15_);
+	_tmp4_ = uri;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_free0 (suffix);
+	_tmp5_ = g_path_get_basename (_tmp4_);
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		suffix = _tmp16_;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp17_ = uri;
+	basename = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp18_ = uri;
+	_tmp6_ = uri;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp19_ = strlen (_tmp18_);
+	_tmp7_ = g_strdup (_tmp6_);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp20_ = _tmp19_;
+	prefix = _tmp7_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp21_ = suffix;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp22_ = strlen (_tmp21_);
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp23_ = _tmp22_;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_tmp24_ = string_slice (_tmp17_, (glong) 0, (glong) (_tmp20_ - _tmp23_));
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		_g_free0 (prefix);
+	_tmp8_ = g_strdup ("");
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		prefix = _tmp24_;
-#line 873 "book.c"
-	}
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp25_ = book_get_n_pages (self);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp26_ = g_strdup_printf ("%u", _tmp25_);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp27_ = _tmp26_;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp28_ = strlen (_tmp27_);
+	suffix = _tmp8_;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp9_ = basename;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	extension_index = _tmp10_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp29_ = _tmp28_;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp30_ = _tmp29_;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp27_);
+	_tmp11_ = extension_index;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	width = _tmp30_;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp31_ = width;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp32_ = g_strdup_printf ("%%0%dd", _tmp31_);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	number_format = _tmp32_;
+	if (_tmp11_ >= 0) {
+#line 787 "book.c"
+		const gchar* _tmp12_ = NULL;
+		gint _tmp13_ = 0;
+		const gchar* _tmp14_ = NULL;
+		gint _tmp15_ = 0;
+		gint _tmp16_ = 0;
+		gchar* _tmp17_ = NULL;
+		const gchar* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
+		gint _tmp20_ = 0;
+		gint _tmp21_ = 0;
+		const gchar* _tmp22_ = NULL;
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		gchar* _tmp25_ = NULL;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp33_ = prefix;
+		_tmp12_ = basename;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp34_ = g_strconcat (_tmp33_, "-", NULL);
+		_tmp13_ = extension_index;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp35_ = _tmp34_;
+		_tmp14_ = basename;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp36_ = number_format;
+		_tmp15_ = strlen (_tmp14_);
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp37_ = i;
+		_tmp16_ = _tmp15_;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp38_ = g_strdup_printf (_tmp36_, _tmp37_ + 1);
+		_tmp17_ = string_slice (_tmp12_, (glong) _tmp13_, (glong) _tmp16_);
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp39_ = _tmp38_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp40_ = g_strconcat (_tmp35_, _tmp39_, NULL);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp41_ = _tmp40_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp42_ = suffix;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp43_ = g_strconcat (_tmp41_, _tmp42_, NULL);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp44_ = _tmp43_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp41_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp39_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp35_);
+		_g_free0 (suffix);
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	filename = _tmp44_;
+		suffix = _tmp17_;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp45_ = filename;
+		_tmp18_ = uri;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp46_ = g_file_new_for_uri (_tmp45_);
+		_tmp19_ = uri;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	result = _tmp46_;
+		_tmp20_ = strlen (_tmp19_);
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (filename);
+		_tmp21_ = _tmp20_;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (number_format);
+		_tmp22_ = suffix;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (suffix);
+		_tmp23_ = strlen (_tmp22_);
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (prefix);
+		_tmp24_ = _tmp23_;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (basename);
+		_tmp25_ = string_slice (_tmp18_, (glong) 0, (glong) (_tmp21_ - _tmp24_));
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		_g_free0 (prefix);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		prefix = _tmp25_;
+#line 838 "book.c"
+	}
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp26_ = book_get_n_pages (self);
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp27_ = _tmp26_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp28_ = g_strdup_printf ("%u", _tmp27_);
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp29_ = _tmp28_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp30_ = strlen (_tmp29_);
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp31_ = _tmp30_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp32_ = _tmp31_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp29_);
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	width = _tmp32_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp33_ = width;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp34_ = g_strdup_printf ("%%0%dd", _tmp33_);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	number_format = _tmp34_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp35_ = prefix;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp36_ = g_strconcat (_tmp35_, "-", NULL);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp37_ = _tmp36_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp38_ = number_format;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp39_ = i;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp40_ = g_strdup_printf (_tmp38_, _tmp39_ + 1);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp41_ = _tmp40_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp42_ = g_strconcat (_tmp37_, _tmp41_, NULL);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp43_ = _tmp42_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp44_ = suffix;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp45_ = g_strconcat (_tmp43_, _tmp44_, NULL);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp46_ = _tmp45_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp43_);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp41_);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp37_);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	filename = _tmp46_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp47_ = filename;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp48_ = g_file_new_for_uri (_tmp47_);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = _tmp48_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (filename);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (number_format);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (suffix);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (prefix);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (basename);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 947 "book.c"
+#line 914 "book.c"
 }
 
 
 static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 959 "book.c"
+#line 926 "book.c"
 	{
-		gint i;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		gint i = 0;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 964 "book.c"
+#line 931 "book.c"
 		{
-			gboolean _tmp0_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			gboolean _tmp0_ = FALSE;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp0_ = TRUE;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 971 "book.c"
-				gboolean _tmp1_;
-				gint _tmp3_;
+#line 938 "book.c"
+				gboolean _tmp1_ = FALSE;
+				gint _tmp3_ = 0;
 				guint _tmp4_ = 0U;
-				gint _tmp5_;
-				Page* _tmp6_ = NULL;
-				Page* page;
-				Page* _tmp7_;
-				const gchar* _tmp8_;
-				gint _tmp9_;
-				GFile* _tmp10_;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_;
-				gint _tmp13_;
-				GFile* _tmp14_ = NULL;
-				GFile* _tmp15_;
-				gint _tmp16_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				guint _tmp5_ = 0U;
+				Page* page = NULL;
+				gint _tmp6_ = 0;
+				Page* _tmp7_ = NULL;
+				Page* _tmp8_ = NULL;
+				const gchar* _tmp9_ = NULL;
+				gint _tmp10_ = 0;
+				GFile* _tmp11_ = NULL;
+				gchar* _tmp12_ = NULL;
+				gchar* _tmp13_ = NULL;
+				gint _tmp14_ = 0;
+				GFile* _tmp15_ = NULL;
+				GFile* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp1_ = _tmp0_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp1_) {
-#line 992 "book.c"
-					gint _tmp2_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 960 "book.c"
+					gint _tmp2_ = 0;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp2_ = i;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp2_ + 1;
-#line 998 "book.c"
+#line 966 "book.c"
 				}
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp3_ = i;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = book_get_n_pages (self);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp3_) < _tmp4_)) {
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp5_ = _tmp4_;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp3_) < _tmp5_)) {
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 1010 "book.c"
+#line 980 "book.c"
 				}
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = i;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = book_get_page (self, _tmp5_);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp6_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = page;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = type;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = quality;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp10_ = file;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp11_ = g_file_get_uri (_tmp10_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp12_ = _tmp11_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp13_ = i;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp14_ = book_make_indexed_file (self, _tmp12_, _tmp13_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp15_ = _tmp14_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_save (_tmp7_, _tmp8_, _tmp9_, _tmp15_, &_inner_error_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (_tmp15_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp12_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp6_ = i;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp7_ = book_get_page (self, _tmp6_);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page = _tmp7_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp8_ = page;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp9_ = type;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp10_ = quality;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp11_ = file;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp12_ = g_file_get_uri (_tmp11_);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp13_ = _tmp12_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp14_ = i;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp15_ = book_make_indexed_file (self, _tmp13_, _tmp14_);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp16_ = _tmp15_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_save (_tmp8_, _tmp9_, _tmp10_, _tmp16_, &_inner_error_);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_object_unref0 (_tmp16_);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp13_);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_page_unref0 (page);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 1050 "book.c"
+#line 1020 "book.c"
 				}
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp16_ = i;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp16_);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp17_ = i;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp17_);
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 1058 "book.c"
+#line 1028 "book.c"
 			}
 		}
 	}
@@ -1062,506 +1032,518 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 
 
 static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkPixbuf* image, gdouble dpi) {
-	cairo_surface_t* _tmp0_;
-	cairo_t* _tmp1_;
-	cairo_t* context;
-	gdouble _tmp2_;
-	gdouble _tmp3_;
-	GdkPixbuf* _tmp4_;
+	cairo_t* context = NULL;
+	cairo_surface_t* _tmp0_ = NULL;
+	cairo_t* _tmp1_ = NULL;
+	gdouble _tmp2_ = 0.0;
+	gdouble _tmp3_ = 0.0;
+	GdkPixbuf* _tmp4_ = NULL;
 	cairo_pattern_t* _tmp5_ = NULL;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (surface != NULL);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (image != NULL);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = surface;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = cairo_create (_tmp0_);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	context = _tmp1_;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = dpi;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = dpi;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_scale (context, 72.0 / _tmp2_, 72.0 / _tmp3_);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = image;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	gdk_cairo_set_source_pixbuf (context, _tmp4_, (gdouble) 0, (gdouble) 0);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = cairo_get_source (context);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_pattern_set_filter (_tmp5_, CAIRO_FILTER_BEST);
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_paint (context);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_destroy0 (context);
-#line 1103 "book.c"
+#line 1073 "book.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 1110 "book.c"
+#line 1080 "book.c"
 }
 
 
 static void book_save_ps (Book* self, GFile* file, GError** error) {
-	GFile* _tmp0_;
+	GFileOutputStream* stream = NULL;
+	GFile* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-	GFileOutputStream* stream;
-	PsWriter* _tmp2_;
-	PsWriter* writer;
-	PsWriter* _tmp3_;
-	cairo_surface_t* _tmp4_;
-	cairo_surface_t* _tmp5_;
-	cairo_surface_t* surface;
+	PsWriter* writer = NULL;
+	PsWriter* _tmp2_ = NULL;
+	cairo_surface_t* surface = NULL;
+	PsWriter* _tmp3_ = NULL;
+	cairo_surface_t* _tmp4_ = NULL;
+	cairo_surface_t* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = file;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 1141 "book.c"
+#line 1111 "book.c"
 	}
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = ps_writer_new (stream);
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp2_;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = writer;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = _tmp3_->surface;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = _cairo_surface_reference0 (_tmp4_);
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	surface = _tmp5_;
-#line 1155 "book.c"
+#line 1125 "book.c"
 	{
-		gint i;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		gint i = 0;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1160 "book.c"
+#line 1130 "book.c"
 		{
-			gboolean _tmp6_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			gboolean _tmp6_ = FALSE;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp6_ = TRUE;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 1167 "book.c"
-				gboolean _tmp7_;
-				gint _tmp9_;
+#line 1137 "book.c"
+				gboolean _tmp7_ = FALSE;
+				gint _tmp9_ = 0;
 				guint _tmp10_ = 0U;
-				gint _tmp11_;
-				Page* _tmp12_ = NULL;
-				Page* page;
-				Page* _tmp13_;
-				GdkPixbuf* _tmp14_ = NULL;
-				GdkPixbuf* image;
-				GdkPixbuf* _tmp15_;
-				gint _tmp16_ = 0;
-				Page* _tmp17_;
-				gint _tmp18_ = 0;
-				gdouble width;
-				GdkPixbuf* _tmp19_;
+				guint _tmp11_ = 0U;
+				Page* page = NULL;
+				gint _tmp12_ = 0;
+				Page* _tmp13_ = NULL;
+				GdkPixbuf* image = NULL;
+				Page* _tmp14_ = NULL;
+				GdkPixbuf* _tmp15_ = NULL;
+				gdouble width = 0.0;
+				GdkPixbuf* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
+				Page* _tmp18_ = NULL;
+				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
-				Page* _tmp21_;
+				gdouble height = 0.0;
+				GdkPixbuf* _tmp21_ = NULL;
 				gint _tmp22_ = 0;
-				gdouble height;
-				cairo_surface_t* _tmp23_;
-				gdouble _tmp24_;
-				gdouble _tmp25_;
-				cairo_surface_t* _tmp26_;
-				GdkPixbuf* _tmp27_;
-				Page* _tmp28_;
-				gint _tmp29_ = 0;
-				cairo_surface_t* _tmp30_;
-				gint _tmp31_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				Page* _tmp23_ = NULL;
+				gint _tmp24_ = 0;
+				gint _tmp25_ = 0;
+				cairo_surface_t* _tmp26_ = NULL;
+				gdouble _tmp27_ = 0.0;
+				gdouble _tmp28_ = 0.0;
+				cairo_surface_t* _tmp29_ = NULL;
+				GdkPixbuf* _tmp30_ = NULL;
+				Page* _tmp31_ = NULL;
+				gint _tmp32_ = 0;
+				gint _tmp33_ = 0;
+				cairo_surface_t* _tmp34_ = NULL;
+				gint _tmp35_ = 0;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = _tmp6_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp7_) {
-#line 1200 "book.c"
-					gint _tmp8_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 1174 "book.c"
+					gint _tmp8_ = 0;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp8_ = i;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp8_ + 1;
-#line 1206 "book.c"
+#line 1180 "book.c"
 				}
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = FALSE;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = i;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp10_ = book_get_n_pages (self);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp9_) < _tmp10_)) {
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 1218 "book.c"
-				}
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp11_ = i;
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp12_ = book_get_page (self, _tmp11_);
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp12_;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp13_ = page;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp14_ = page_get_image (_tmp13_, TRUE);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp14_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp15_ = image;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp16_ = gdk_pixbuf_get_width (_tmp15_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp17_ = page;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp18_ = page_get_dpi (_tmp17_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width = (_tmp16_ * 72.0) / _tmp18_;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp19_ = image;
+				_tmp9_ = i;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp20_ = gdk_pixbuf_get_height (_tmp19_);
+				_tmp10_ = book_get_n_pages (self);
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp21_ = page;
+				_tmp11_ = _tmp10_;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp22_ = page_get_dpi (_tmp21_);
+				if (!(((guint) _tmp9_) < _tmp11_)) {
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = (_tmp20_ * 72.0) / _tmp22_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp23_ = surface;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp24_ = width;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp25_ = height;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				cairo_ps_surface_set_size (_tmp23_, _tmp24_, _tmp25_);
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp26_ = surface;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp27_ = image;
+					break;
+#line 1194 "book.c"
+				}
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp28_ = page;
+				_tmp12_ = i;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp29_ = page_get_dpi (_tmp28_);
+				_tmp13_ = book_get_page (self, _tmp12_);
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				book_save_ps_pdf_surface (self, _tmp26_, _tmp27_, (gdouble) _tmp29_);
+				page = _tmp13_;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp14_ = page;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp30_ = surface;
+				_tmp15_ = page_get_image (_tmp14_, TRUE);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				cairo_surface_show_page (_tmp30_);
+				image = _tmp15_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp31_ = i;
+				_tmp16_ = image;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp31_);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp17_ = gdk_pixbuf_get_width (_tmp16_);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp18_ = page;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp19_ = page_get_dpi (_tmp18_);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp20_ = _tmp19_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width = (_tmp17_ * 72.0) / _tmp20_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp21_ = image;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp23_ = page;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp24_ = page_get_dpi (_tmp23_);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp25_ = _tmp24_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				height = (_tmp22_ * 72.0) / _tmp25_;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp26_ = surface;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp27_ = width;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp28_ = height;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				cairo_ps_surface_set_size (_tmp26_, _tmp27_, _tmp28_);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp29_ = surface;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp30_ = image;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp31_ = page;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp32_ = page_get_dpi (_tmp31_);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp33_ = _tmp32_;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				book_save_ps_pdf_surface (self, _tmp29_, _tmp30_, (gdouble) _tmp33_);
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp34_ = surface;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				cairo_surface_show_page (_tmp34_);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp35_ = i;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp35_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 1282 "book.c"
+#line 1264 "book.c"
 			}
 		}
 	}
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (surface);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_ps_writer_unref0 (writer);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
-#line 1292 "book.c"
+#line 1274 "book.c"
 }
 
 
 static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, int* result_length1) {
 	guint8* result = NULL;
 	z_stream stream = {0};
-	guint8* _tmp0_;
-	gint _tmp0__length1;
+	guint8* out_data = NULL;
+	guint8* _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
 	guint8* _tmp1_ = NULL;
-	guint8* out_data;
-	gint out_data_length1;
-	gint _out_data_size_;
-	guint8* _tmp2_;
-	gint _tmp2__length1;
-	guint8* _tmp3_;
-	gint _tmp3__length1;
-	z_stream _tmp7_;
-	guint _tmp8_;
-	guint8* _tmp10_;
-	gint _tmp10__length1;
-	z_stream _tmp11_;
-	guint _tmp12_;
-	guint n_written;
-	guint _tmp13_;
+	gint out_data_length1 = 0;
+	gint _out_data_size_ = 0;
+	guint8* _tmp2_ = NULL;
+	gint _tmp2__length1 = 0;
+	guint8* _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	z_stream _tmp7_ = {0};
+	guint _tmp8_ = 0U;
+	guint n_written = 0U;
+	guint8* _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+	z_stream _tmp11_ = {0};
+	guint _tmp12_ = 0U;
+	guint _tmp13_ = 0U;
 	gint _tmp14_ = 0;
-	guint8* _tmp15_;
-	gint _tmp15__length1;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	guint8* _tmp15_ = NULL;
+	gint _tmp15__length1 = 0;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateInit (&stream, (gint) Z_BEST_COMPRESSION);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = data;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0__length1 = data_length1;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_new0 (guint8, _tmp0__length1);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = _tmp1_;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp0__length1;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = out_data_length1;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = data;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2__length1 = data_length1;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_in = _tmp2_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_in = _tmp2__length1;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = out_data;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = out_data_length1;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_out = _tmp3_;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_out = _tmp3__length1;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	while (TRUE) {
-#line 1354 "book.c"
-		z_stream _tmp4_;
-		guint _tmp5_;
+#line 1336 "book.c"
+		z_stream _tmp4_ = {0};
+		guint _tmp5_ = 0U;
 		gint _tmp6_ = 0;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp4_ = stream;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp5_ = _tmp4_.avail_in;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (!(_tmp5_ > ((guint) 0))) {
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
-#line 1366 "book.c"
+#line 1348 "book.c"
 		}
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp6_ = deflate (&stream, (gint) Z_FINISH);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_tmp6_ == ((gint) Z_STREAM_ERROR)) {
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
-#line 1374 "book.c"
+#line 1356 "book.c"
 		}
 	}
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = stream;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = _tmp7_.avail_in;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp8_ > ((guint) 0)) {
-#line 1383 "book.c"
-		guint8* _tmp9_;
-		gint _tmp9__length1;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 1365 "book.c"
+		guint8* _tmp9_ = NULL;
+		gint _tmp9__length1 = 0;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9_ = NULL;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9__length1 = 0;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (result_length1) {
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			*result_length1 = _tmp9__length1;
-#line 1394 "book.c"
+#line 1376 "book.c"
 		}
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp9_;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		out_data = (g_free (out_data), NULL);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		deflateEnd (&stream);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 1404 "book.c"
+#line 1386 "book.c"
 	}
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = data;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10__length1 = data_length1;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = stream;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = _tmp11_.avail_out;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	n_written = _tmp10__length1 - _tmp12_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = n_written;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = (gint) _tmp13_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = g_renew (guint8, out_data, (gint) _tmp13_);
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(_tmp14_ > out_data_length1) ? memset (out_data + out_data_length1, 0, sizeof (guint8) * (_tmp14_ - out_data_length1)) : NULL;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp14_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = _tmp14_;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = out_data;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15__length1 = out_data_length1;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp15__length1;
-#line 1436 "book.c"
+#line 1418 "book.c"
 	}
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp15_;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateEnd (&stream);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1444 "book.c"
+#line 1426 "book.c"
 }
 
 
 static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
 	result = book_write_pixbuf_data (self, buf, buf_length1, error);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1453 "book.c"
+#line 1435 "book.c"
 }
 
 
 static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, gint dpi, int* result_length1) {
 	guint8* result = NULL;
-	GByteArray* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
+	GByteArray* _tmp0_ = NULL;
+	gchar** keys = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-	gchar** keys;
-	gint keys_length1;
-	gint _keys_size_;
-	gint _tmp6_;
+	gint keys_length1 = 0;
+	gint _keys_size_ = 0;
+	gchar** values = NULL;
+	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	gint _tmp9_;
+	gchar* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
 	gchar* _tmp10_ = NULL;
-	gint _tmp11_;
+	gint _tmp11_ = 0;
 	gchar* _tmp12_ = NULL;
 	gchar** _tmp13_ = NULL;
-	gchar** values;
-	gint values_length1;
-	gint _values_size_;
-	GByteArray* _tmp15_;
-	guint8* _tmp16_;
-	gint _tmp16__length1;
-	guint8* data;
-	gint data_length1;
-	gint _data_size_;
-	guint8* _tmp17_;
-	gint _tmp17__length1;
+	gint values_length1 = 0;
+	gint _values_size_ = 0;
+	guint8* data = NULL;
+	GByteArray* _tmp15_ = NULL;
+	guint8* _tmp16_ = NULL;
+	gint _tmp16__length1 = 0;
+	gint data_length1 = 0;
+	gint _data_size_ = 0;
+	guint8* _tmp17_ = NULL;
+	gint _tmp17__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (image != NULL, NULL);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = g_byte_array_new ();
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->jpeg_data = _tmp0_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_strdup ("quality");
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_strdup ("density-unit");
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = g_strdup ("x-density");
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = g_strdup ("y-density");
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = g_new0 (gchar*, 5 + 1);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[0] = _tmp1_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[1] = _tmp2_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[2] = _tmp3_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[3] = _tmp4_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[4] = NULL;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys = _tmp5_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys_length1 = 5;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_keys_size_ = keys_length1;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = quality;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = g_strdup ("dots-per-inch");
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = dpi;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = g_strdup_printf ("%d", _tmp9_);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = dpi;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = g_strdup_printf ("%d", _tmp11_);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = g_new0 (gchar*, 5 + 1);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[0] = _tmp7_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[1] = _tmp8_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[2] = _tmp10_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[3] = _tmp12_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[4] = NULL;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values = _tmp13_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values_length1 = 5;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_values_size_ = values_length1;
-#line 1556 "book.c"
+#line 1538 "book.c"
 	{
-		GdkPixbuf* _tmp14_;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		GdkPixbuf* _tmp14_ = NULL;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp14_ = image;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		gdk_pixbuf_save_to_callbackv (_tmp14_, _book_write_pixbuf_data_gdk_pixbuf_save_func, self, "jpeg", keys, values, &_inner_error_);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-#line 1565 "book.c"
+#line 1547 "book.c"
 			goto __catch0_g_error;
 		}
 	}
@@ -1569,904 +1551,922 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	__catch0_g_error:
 	{
 		GError* e = NULL;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 1579 "book.c"
+#line 1561 "book.c"
 	}
 	__finally0:
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return NULL;
-#line 1594 "book.c"
+#line 1576 "book.c"
 	}
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = self->priv->jpeg_data;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = _tmp15_->data;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16__length1 = _tmp15_->len;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_->data = NULL;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	data = _tmp16_;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	data_length1 = _tmp16__length1;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_data_size_ = data_length1;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->jpeg_data = NULL;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17_ = data;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17__length1 = data_length1;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp17__length1;
-#line 1622 "book.c"
+#line 1604 "book.c"
 	}
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp17_;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1632 "book.c"
+#line 1614 "book.c"
 }
 
 
 static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1, GError** error) {
 	gboolean result = FALSE;
-	GByteArray* _tmp0_;
-	guint8* _tmp1_;
-	gint _tmp1__length1;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	GByteArray* _tmp0_ = NULL;
+	guint8* _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->jpeg_data;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = buf;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1__length1 = buf_length1;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_byte_array_append (_tmp0_, _tmp1_, _tmp1__length1);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = TRUE;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1655 "book.c"
+#line 1637 "book.c"
 }
 
 
 static guint8* _vala_array_dup1 (guint8* self, int length) {
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1662 "book.c"
+#line 1644 "book.c"
 }
 
 
 static guint8* _vala_array_dup2 (guint8* self, int length) {
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1669 "book.c"
+#line 1651 "book.c"
 }
 
 
 static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error) {
-	GFile* _tmp0_;
+	GFileOutputStream* stream = NULL;
+	GFile* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-	GFileOutputStream* stream;
-	PDFWriter* _tmp2_;
-	PDFWriter* writer;
-	PDFWriter* _tmp3_;
-	PDFWriter* _tmp4_;
-	PDFWriter* _tmp5_;
+	PDFWriter* writer = NULL;
+	PDFWriter* _tmp2_ = NULL;
+	PDFWriter* _tmp3_ = NULL;
+	PDFWriter* _tmp4_ = NULL;
+	guint catalog_number = 0U;
+	PDFWriter* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
-	guint catalog_number;
-	PDFWriter* _tmp7_;
-	guint _tmp8_;
+	PDFWriter* _tmp7_ = NULL;
+	guint _tmp8_ = 0U;
 	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_;
-	PDFWriter* _tmp11_;
-	PDFWriter* _tmp12_;
-	PDFWriter* _tmp13_;
-	guint _tmp14_;
+	gchar* _tmp10_ = NULL;
+	PDFWriter* _tmp11_ = NULL;
+	PDFWriter* _tmp12_ = NULL;
+	PDFWriter* _tmp13_ = NULL;
+	guint _tmp14_ = 0U;
 	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_;
-	PDFWriter* _tmp17_;
-	PDFWriter* _tmp18_;
-	PDFWriter* _tmp19_;
-	PDFWriter* _tmp20_;
+	gchar* _tmp16_ = NULL;
+	PDFWriter* _tmp17_ = NULL;
+	PDFWriter* _tmp18_ = NULL;
+	PDFWriter* _tmp19_ = NULL;
+	guint pages_number = 0U;
+	PDFWriter* _tmp20_ = NULL;
 	guint _tmp21_ = 0U;
-	guint pages_number;
-	PDFWriter* _tmp22_;
-	guint _tmp23_;
+	PDFWriter* _tmp22_ = NULL;
+	guint _tmp23_ = 0U;
 	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_;
-	PDFWriter* _tmp26_;
-	PDFWriter* _tmp27_;
-	PDFWriter* _tmp28_;
-	PDFWriter* _tmp39_;
-	PDFWriter* _tmp40_;
-	guint _tmp41_ = 0U;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_;
-	PDFWriter* _tmp44_;
-	PDFWriter* _tmp45_;
-	PDFWriter* _tmp352_;
-	PDFWriter* _tmp353_;
-	guint _tmp354_ = 0U;
-	guint info_number;
-	PDFWriter* _tmp355_;
-	guint _tmp356_;
-	gchar* _tmp357_ = NULL;
-	gchar* _tmp358_;
-	PDFWriter* _tmp359_;
-	PDFWriter* _tmp360_;
-	gchar* _tmp361_ = NULL;
-	gchar* _tmp362_;
-	PDFWriter* _tmp363_;
-	PDFWriter* _tmp364_;
-	PDFWriter* _tmp365_;
-	gsize _tmp366_;
-	gsize xref_offset;
-	PDFWriter* _tmp367_;
-	PDFWriter* _tmp368_;
-	PDFWriter* _tmp369_;
-	GList* _tmp370_;
-	guint _tmp371_ = 0U;
-	gchar* _tmp372_ = NULL;
-	gchar* _tmp373_;
-	PDFWriter* _tmp374_;
-	GList* _tmp375_;
-	PDFWriter* _tmp380_;
-	PDFWriter* _tmp381_;
-	PDFWriter* _tmp382_;
-	PDFWriter* _tmp383_;
-	GList* _tmp384_;
-	guint _tmp385_ = 0U;
-	gchar* _tmp386_ = NULL;
-	gchar* _tmp387_;
-	PDFWriter* _tmp388_;
-	guint _tmp389_;
-	gchar* _tmp390_ = NULL;
-	gchar* _tmp391_;
-	PDFWriter* _tmp392_;
-	guint _tmp393_;
-	gchar* _tmp394_ = NULL;
-	gchar* _tmp395_;
-	PDFWriter* _tmp396_;
-	PDFWriter* _tmp397_;
-	PDFWriter* _tmp398_;
-	gsize _tmp399_;
+	gchar* _tmp25_ = NULL;
+	PDFWriter* _tmp26_ = NULL;
+	PDFWriter* _tmp27_ = NULL;
+	PDFWriter* _tmp28_ = NULL;
+	PDFWriter* _tmp40_ = NULL;
+	PDFWriter* _tmp41_ = NULL;
+	guint _tmp42_ = 0U;
+	guint _tmp43_ = 0U;
+	gchar* _tmp44_ = NULL;
+	gchar* _tmp45_ = NULL;
+	PDFWriter* _tmp46_ = NULL;
+	PDFWriter* _tmp47_ = NULL;
+	PDFWriter* _tmp361_ = NULL;
+	guint info_number = 0U;
+	PDFWriter* _tmp362_ = NULL;
+	guint _tmp363_ = 0U;
+	PDFWriter* _tmp364_ = NULL;
+	guint _tmp365_ = 0U;
+	gchar* _tmp366_ = NULL;
+	gchar* _tmp367_ = NULL;
+	PDFWriter* _tmp368_ = NULL;
+	PDFWriter* _tmp369_ = NULL;
+	gchar* _tmp370_ = NULL;
+	gchar* _tmp371_ = NULL;
+	PDFWriter* _tmp372_ = NULL;
+	PDFWriter* _tmp373_ = NULL;
+	gsize xref_offset = 0UL;
+	PDFWriter* _tmp374_ = NULL;
+	gsize _tmp375_ = 0UL;
+	PDFWriter* _tmp376_ = NULL;
+	PDFWriter* _tmp377_ = NULL;
+	PDFWriter* _tmp378_ = NULL;
+	GList* _tmp379_ = NULL;
+	guint _tmp380_ = 0U;
+	gchar* _tmp381_ = NULL;
+	gchar* _tmp382_ = NULL;
+	PDFWriter* _tmp383_ = NULL;
+	GList* _tmp384_ = NULL;
+	PDFWriter* _tmp389_ = NULL;
+	PDFWriter* _tmp390_ = NULL;
+	PDFWriter* _tmp391_ = NULL;
+	PDFWriter* _tmp392_ = NULL;
+	GList* _tmp393_ = NULL;
+	guint _tmp394_ = 0U;
+	gchar* _tmp395_ = NULL;
+	gchar* _tmp396_ = NULL;
+	PDFWriter* _tmp397_ = NULL;
+	guint _tmp398_ = 0U;
+	gchar* _tmp399_ = NULL;
 	gchar* _tmp400_ = NULL;
-	gchar* _tmp401_;
-	PDFWriter* _tmp402_;
+	PDFWriter* _tmp401_ = NULL;
+	guint _tmp402_ = 0U;
+	gchar* _tmp403_ = NULL;
+	gchar* _tmp404_ = NULL;
+	PDFWriter* _tmp405_ = NULL;
+	PDFWriter* _tmp406_ = NULL;
+	PDFWriter* _tmp407_ = NULL;
+	gsize _tmp408_ = 0UL;
+	gchar* _tmp409_ = NULL;
+	gchar* _tmp410_ = NULL;
+	PDFWriter* _tmp411_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = file;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 1780 "book.c"
+#line 1763 "book.c"
 	}
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = pdf_writer_new (stream);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp2_;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = writer;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp3_, "%PDF-1.3\n");
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = writer;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp4_, "%\xe2\xe3\xcf\xd3\n");
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = writer;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = pdf_writer_start_object (_tmp5_);
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	catalog_number = _tmp6_;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = writer;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = catalog_number;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = g_strdup_printf ("%u 0 obj\n", _tmp8_);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = _tmp9_;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp7_, _tmp10_);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp10_);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = writer;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp11_, "<<\n");
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = writer;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp12_, "/Type /Catalog\n");
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = writer;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = catalog_number;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp14_ + 1);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = _tmp15_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp13_, _tmp16_);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp16_);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17_ = writer;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp17_, ">>\n");
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp18_ = writer;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp18_, "endobj\n");
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp19_ = writer;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp19_, "\n");
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp20_ = writer;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp21_ = pdf_writer_start_object (_tmp20_);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pages_number = _tmp21_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp22_ = writer;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp23_ = pages_number;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp24_ = g_strdup_printf ("%u 0 obj\n", _tmp23_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp25_ = _tmp24_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp22_, _tmp25_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp25_);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = writer;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp26_, "<<\n");
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp27_ = writer;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp27_, "/Type /Pages\n");
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp28_ = writer;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp28_, "/Kids [");
-#line 1874 "book.c"
+#line 1857 "book.c"
 	{
-		gint i;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		gint i = 0;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1879 "book.c"
+#line 1862 "book.c"
 		{
-			gboolean _tmp29_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			gboolean _tmp29_ = FALSE;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp29_ = TRUE;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 1886 "book.c"
-				gboolean _tmp30_;
-				gint _tmp32_;
+#line 1869 "book.c"
+				gboolean _tmp30_ = FALSE;
+				gint _tmp32_ = 0;
 				guint _tmp33_ = 0U;
-				PDFWriter* _tmp34_;
-				guint _tmp35_;
-				gint _tmp36_;
-				gchar* _tmp37_ = NULL;
-				gchar* _tmp38_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				guint _tmp34_ = 0U;
+				PDFWriter* _tmp35_ = NULL;
+				guint _tmp36_ = 0U;
+				gint _tmp37_ = 0;
+				gchar* _tmp38_ = NULL;
+				gchar* _tmp39_ = NULL;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp30_ = _tmp29_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp30_) {
-#line 1899 "book.c"
-					gint _tmp31_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 1883 "book.c"
+					gint _tmp31_ = 0;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp31_ = i;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp31_ + 1;
-#line 1905 "book.c"
+#line 1889 "book.c"
 				}
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp29_ = FALSE;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp32_ = i;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp33_ = book_get_n_pages (self);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp32_) < _tmp33_)) {
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp34_ = _tmp33_;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp32_) < _tmp34_)) {
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 1917 "book.c"
+#line 1903 "book.c"
 				}
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34_ = writer;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp35_ = pages_number;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp36_ = i;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp37_ = g_strdup_printf (" %u 0 R", (_tmp35_ + 1) + (_tmp36_ * 3));
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp38_ = _tmp37_;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp34_, _tmp38_);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp38_);
-#line 1933 "book.c"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp35_ = writer;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp36_ = pages_number;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp37_ = i;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp38_ = g_strdup_printf (" %u 0 R", (_tmp36_ + 1) + (_tmp37_ * 3));
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp39_ = _tmp38_;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp35_, _tmp39_);
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp39_);
+#line 1919 "book.c"
 			}
 		}
 	}
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp39_ = writer;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp39_, " ]\n");
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp40_ = writer;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp41_ = book_get_n_pages (self);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp42_ = g_strdup_printf ("/Count %u\n", _tmp41_);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp40_, " ]\n");
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp41_ = writer;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp42_ = book_get_n_pages (self);
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp43_ = _tmp42_;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp40_, _tmp43_);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp43_);
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp44_ = writer;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp44_, ">>\n");
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp45_ = writer;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp45_, "endobj\n");
-#line 1961 "book.c"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp44_ = g_strdup_printf ("/Count %u\n", _tmp43_);
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp45_ = _tmp44_;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp41_, _tmp45_);
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp45_);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp46_ = writer;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp46_, ">>\n");
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp47_ = writer;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp47_, "endobj\n");
+#line 1949 "book.c"
 	{
-		gint i;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		gint i = 0;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1966 "book.c"
+#line 1954 "book.c"
 		{
-			gboolean _tmp46_;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp46_ = TRUE;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			gboolean _tmp48_ = FALSE;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp48_ = TRUE;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 1973 "book.c"
-				gboolean _tmp47_;
-				gint _tmp49_;
-				guint _tmp50_ = 0U;
-				gint _tmp51_;
-				Page* _tmp52_ = NULL;
-				Page* page;
-				Page* _tmp53_;
-				GdkPixbuf* _tmp54_ = NULL;
-				GdkPixbuf* image;
-				GdkPixbuf* _tmp55_;
-				gint _tmp56_ = 0;
-				gint width;
-				GdkPixbuf* _tmp57_;
-				gint _tmp58_ = 0;
-				gint height;
-				GdkPixbuf* _tmp59_;
-				guint8* _tmp60_ = NULL;
-				guint8* pixels;
-				gint pixels_length1;
-				gint _pixels_size_;
-				gint _tmp61_;
-				Page* _tmp62_;
-				gint _tmp63_ = 0;
-				gdouble page_width;
-				gint _tmp64_;
-				Page* _tmp65_;
+#line 1961 "book.c"
+				gboolean _tmp49_ = FALSE;
+				gint _tmp51_ = 0;
+				guint _tmp52_ = 0U;
+				guint _tmp53_ = 0U;
+				Page* page = NULL;
+				gint _tmp54_ = 0;
+				Page* _tmp55_ = NULL;
+				GdkPixbuf* image = NULL;
+				Page* _tmp56_ = NULL;
+				GdkPixbuf* _tmp57_ = NULL;
+				gint width = 0;
+				GdkPixbuf* _tmp58_ = NULL;
+				gint _tmp59_ = 0;
+				gint height = 0;
+				GdkPixbuf* _tmp60_ = NULL;
+				gint _tmp61_ = 0;
+				guint8* pixels = NULL;
+				GdkPixbuf* _tmp62_ = NULL;
+				guint8* _tmp63_ = NULL;
+				gint pixels_length1 = 0;
+				gint _pixels_size_ = 0;
+				gdouble page_width = 0.0;
+				gint _tmp64_ = 0;
+				Page* _tmp65_ = NULL;
 				gint _tmp66_ = 0;
-				gdouble page_height;
-				gint depth;
-				gchar* _tmp67_;
-				gchar* color_space;
-				gchar* filter;
-				gchar* _tmp68_ = NULL;
-				gchar* width_buffer;
-				gint width_buffer_length1;
-				gint _width_buffer_size_;
-				gchar* _tmp69_ = NULL;
-				gchar* height_buffer;
-				gint height_buffer_length1;
-				gint _height_buffer_size_;
+				gint _tmp67_ = 0;
+				gdouble page_height = 0.0;
+				gint _tmp68_ = 0;
+				Page* _tmp69_ = NULL;
+				gint _tmp70_ = 0;
+				gint _tmp71_ = 0;
+				gint depth = 0;
+				gchar* color_space = NULL;
+				gchar* _tmp72_ = NULL;
+				gchar* filter = NULL;
+				gchar* width_buffer = NULL;
+				gchar* _tmp73_ = NULL;
+				gint width_buffer_length1 = 0;
+				gint _width_buffer_size_ = 0;
+				gchar* height_buffer = NULL;
+				gchar* _tmp74_ = NULL;
+				gint height_buffer_length1 = 0;
+				gint _height_buffer_size_ = 0;
 				guint8* data = NULL;
 				gint data_length1 = 0;
 				gint _data_size_ = 0;
-				Page* _tmp70_;
-				gboolean _tmp71_ = FALSE;
-				guint8* _tmp227_;
-				gint _tmp227__length1;
-				gint _tmp228_ = 0;
-				guint8* _tmp229_ = NULL;
-				guint8* compressed_data;
-				gint compressed_data_length1;
-				gint _compressed_data_size_;
-				guint8* _tmp230_;
-				gint _tmp230__length1;
-				PDFWriter* _tmp247_;
-				PDFWriter* _tmp248_;
-				guint _tmp249_ = 0U;
-				guint number;
-				PDFWriter* _tmp250_;
-				guint _tmp251_;
-				gchar* _tmp252_ = NULL;
-				gchar* _tmp253_;
-				PDFWriter* _tmp254_;
-				PDFWriter* _tmp255_;
-				PDFWriter* _tmp256_;
-				guint _tmp257_;
-				gchar* _tmp258_ = NULL;
-				gchar* _tmp259_;
-				PDFWriter* _tmp260_;
-				gint _tmp261_;
-				guint _tmp262_;
-				gchar* _tmp263_ = NULL;
-				gchar* _tmp264_;
-				PDFWriter* _tmp265_;
-				gdouble _tmp266_;
-				gchar* _tmp267_;
-				gint _tmp267__length1;
-				const gchar* _tmp268_ = NULL;
-				gdouble _tmp269_;
-				gchar* _tmp270_;
-				gint _tmp270__length1;
-				const gchar* _tmp271_ = NULL;
+				Page* _tmp75_ = NULL;
+				gboolean _tmp76_ = FALSE;
+				gboolean _tmp77_ = FALSE;
+				guint8* compressed_data = NULL;
+				guint8* _tmp235_ = NULL;
+				gint _tmp235__length1 = 0;
+				gint _tmp236_ = 0;
+				guint8* _tmp237_ = NULL;
+				gint compressed_data_length1 = 0;
+				gint _compressed_data_size_ = 0;
+				guint8* _tmp238_ = NULL;
+				gint _tmp238__length1 = 0;
+				PDFWriter* _tmp256_ = NULL;
+				guint number = 0U;
+				PDFWriter* _tmp257_ = NULL;
+				guint _tmp258_ = 0U;
+				PDFWriter* _tmp259_ = NULL;
+				guint _tmp260_ = 0U;
+				gchar* _tmp261_ = NULL;
+				gchar* _tmp262_ = NULL;
+				PDFWriter* _tmp263_ = NULL;
+				PDFWriter* _tmp264_ = NULL;
+				PDFWriter* _tmp265_ = NULL;
+				guint _tmp266_ = 0U;
+				gchar* _tmp267_ = NULL;
+				gchar* _tmp268_ = NULL;
+				PDFWriter* _tmp269_ = NULL;
+				gint _tmp270_ = 0;
+				guint _tmp271_ = 0U;
 				gchar* _tmp272_ = NULL;
-				gchar* _tmp273_;
-				PDFWriter* _tmp274_;
-				guint _tmp275_;
+				gchar* _tmp273_ = NULL;
+				PDFWriter* _tmp274_ = NULL;
+				gdouble _tmp275_ = 0.0;
 				gchar* _tmp276_ = NULL;
-				gchar* _tmp277_;
-				PDFWriter* _tmp278_;
-				PDFWriter* _tmp279_;
-				PDFWriter* _tmp280_;
-				PDFWriter* _tmp281_;
-				guint _tmp282_ = 0U;
-				PDFWriter* _tmp283_;
-				guint _tmp284_;
+				gint _tmp276__length1 = 0;
+				const gchar* _tmp277_ = NULL;
+				gdouble _tmp278_ = 0.0;
+				gchar* _tmp279_ = NULL;
+				gint _tmp279__length1 = 0;
+				const gchar* _tmp280_ = NULL;
+				gchar* _tmp281_ = NULL;
+				gchar* _tmp282_ = NULL;
+				PDFWriter* _tmp283_ = NULL;
+				guint _tmp284_ = 0U;
 				gchar* _tmp285_ = NULL;
-				gchar* _tmp286_;
-				PDFWriter* _tmp287_;
-				PDFWriter* _tmp288_;
-				PDFWriter* _tmp289_;
-				PDFWriter* _tmp290_;
-				gint _tmp291_;
-				gchar* _tmp292_ = NULL;
-				gchar* _tmp293_;
-				PDFWriter* _tmp294_;
-				gint _tmp295_;
-				gchar* _tmp296_ = NULL;
-				gchar* _tmp297_;
-				PDFWriter* _tmp298_;
-				const gchar* _tmp299_;
-				gchar* _tmp300_ = NULL;
-				gchar* _tmp301_;
-				PDFWriter* _tmp302_;
-				gint _tmp303_;
-				gchar* _tmp304_ = NULL;
-				gchar* _tmp305_;
-				PDFWriter* _tmp306_;
-				guint8* _tmp307_;
-				gint _tmp307__length1;
-				gchar* _tmp308_ = NULL;
-				gchar* _tmp309_;
-				const gchar* _tmp310_;
-				PDFWriter* _tmp315_;
-				PDFWriter* _tmp316_;
-				PDFWriter* _tmp317_;
-				guint8* _tmp318_;
-				gint _tmp318__length1;
-				PDFWriter* _tmp319_;
-				PDFWriter* _tmp320_;
-				PDFWriter* _tmp321_;
-				gdouble _tmp322_;
-				gchar* _tmp323_;
-				gint _tmp323__length1;
-				const gchar* _tmp324_ = NULL;
-				gdouble _tmp325_;
-				gchar* _tmp326_;
-				gint _tmp326__length1;
-				const gchar* _tmp327_ = NULL;
-				gint _tmp328_;
-				gchar* _tmp329_ = NULL;
-				gchar* command;
-				PDFWriter* _tmp330_;
-				PDFWriter* _tmp331_;
-				guint _tmp332_ = 0U;
-				PDFWriter* _tmp333_;
-				guint _tmp334_;
+				gchar* _tmp286_ = NULL;
+				PDFWriter* _tmp287_ = NULL;
+				PDFWriter* _tmp288_ = NULL;
+				PDFWriter* _tmp289_ = NULL;
+				PDFWriter* _tmp290_ = NULL;
+				guint _tmp291_ = 0U;
+				PDFWriter* _tmp292_ = NULL;
+				guint _tmp293_ = 0U;
+				gchar* _tmp294_ = NULL;
+				gchar* _tmp295_ = NULL;
+				PDFWriter* _tmp296_ = NULL;
+				PDFWriter* _tmp297_ = NULL;
+				PDFWriter* _tmp298_ = NULL;
+				PDFWriter* _tmp299_ = NULL;
+				gint _tmp300_ = 0;
+				gchar* _tmp301_ = NULL;
+				gchar* _tmp302_ = NULL;
+				PDFWriter* _tmp303_ = NULL;
+				gint _tmp304_ = 0;
+				gchar* _tmp305_ = NULL;
+				gchar* _tmp306_ = NULL;
+				PDFWriter* _tmp307_ = NULL;
+				const gchar* _tmp308_ = NULL;
+				gchar* _tmp309_ = NULL;
+				gchar* _tmp310_ = NULL;
+				PDFWriter* _tmp311_ = NULL;
+				gint _tmp312_ = 0;
+				gchar* _tmp313_ = NULL;
+				gchar* _tmp314_ = NULL;
+				PDFWriter* _tmp315_ = NULL;
+				guint8* _tmp316_ = NULL;
+				gint _tmp316__length1 = 0;
+				gchar* _tmp317_ = NULL;
+				gchar* _tmp318_ = NULL;
+				const gchar* _tmp319_ = NULL;
+				PDFWriter* _tmp324_ = NULL;
+				PDFWriter* _tmp325_ = NULL;
+				PDFWriter* _tmp326_ = NULL;
+				guint8* _tmp327_ = NULL;
+				gint _tmp327__length1 = 0;
+				PDFWriter* _tmp328_ = NULL;
+				PDFWriter* _tmp329_ = NULL;
+				PDFWriter* _tmp330_ = NULL;
+				gchar* command = NULL;
+				gdouble _tmp331_ = 0.0;
+				gchar* _tmp332_ = NULL;
+				gint _tmp332__length1 = 0;
+				const gchar* _tmp333_ = NULL;
+				gdouble _tmp334_ = 0.0;
 				gchar* _tmp335_ = NULL;
-				gchar* _tmp336_;
-				PDFWriter* _tmp337_;
-				PDFWriter* _tmp338_;
-				const gchar* _tmp339_;
-				gint _tmp340_;
-				gint _tmp341_;
-				gchar* _tmp342_ = NULL;
-				gchar* _tmp343_;
-				PDFWriter* _tmp344_;
-				PDFWriter* _tmp345_;
-				PDFWriter* _tmp346_;
-				const gchar* _tmp347_;
-				PDFWriter* _tmp348_;
-				PDFWriter* _tmp349_;
-				PDFWriter* _tmp350_;
-				gint _tmp351_;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp47_ = _tmp46_;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp47_) {
-#line 2141 "book.c"
-					gint _tmp48_;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp48_ = i;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp48_ + 1;
-#line 2147 "book.c"
-				}
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp46_ = FALSE;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp49_ = i;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp50_ = book_get_n_pages (self);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp49_) < _tmp50_)) {
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					break;
-#line 2159 "book.c"
+				gint _tmp335__length1 = 0;
+				const gchar* _tmp336_ = NULL;
+				gint _tmp337_ = 0;
+				gchar* _tmp338_ = NULL;
+				PDFWriter* _tmp339_ = NULL;
+				PDFWriter* _tmp340_ = NULL;
+				guint _tmp341_ = 0U;
+				PDFWriter* _tmp342_ = NULL;
+				guint _tmp343_ = 0U;
+				gchar* _tmp344_ = NULL;
+				gchar* _tmp345_ = NULL;
+				PDFWriter* _tmp346_ = NULL;
+				PDFWriter* _tmp347_ = NULL;
+				const gchar* _tmp348_ = NULL;
+				gint _tmp349_ = 0;
+				gint _tmp350_ = 0;
+				gchar* _tmp351_ = NULL;
+				gchar* _tmp352_ = NULL;
+				PDFWriter* _tmp353_ = NULL;
+				PDFWriter* _tmp354_ = NULL;
+				PDFWriter* _tmp355_ = NULL;
+				const gchar* _tmp356_ = NULL;
+				PDFWriter* _tmp357_ = NULL;
+				PDFWriter* _tmp358_ = NULL;
+				PDFWriter* _tmp359_ = NULL;
+				gint _tmp360_ = 0;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp49_ = _tmp48_;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp49_) {
+#line 2133 "book.c"
+					gint _tmp50_ = 0;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp50_ = i;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp50_ + 1;
+#line 2139 "book.c"
 				}
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp48_ = FALSE;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp51_ = i;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp52_ = book_get_page (self, _tmp51_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp52_;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp53_ = page;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp54_ = page_get_image (_tmp53_, TRUE);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp54_;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp55_ = image;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp56_ = gdk_pixbuf_get_width (_tmp55_);
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width = _tmp56_;
 #line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp57_ = image;
+				_tmp52_ = book_get_n_pages (self);
 #line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp58_ = gdk_pixbuf_get_height (_tmp57_);
+				_tmp53_ = _tmp52_;
 #line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = _tmp58_;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp59_ = image;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp60_ = gdk_pixbuf_get_pixels (_tmp59_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels = _tmp60_;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels_length1 = -1;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_pixels_size_ = pixels_length1;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp61_ = width;
+				if (!(((guint) _tmp51_) < _tmp53_)) {
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					break;
+#line 2153 "book.c"
+				}
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp62_ = page;
+				_tmp54_ = i;
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp63_ = page_get_dpi (_tmp62_);
+				_tmp55_ = book_get_page (self, _tmp54_);
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_width = (_tmp61_ * 72.0) / _tmp63_;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp64_ = height;
+				page = _tmp55_;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp65_ = page;
+				_tmp56_ = page;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp66_ = page_get_dpi (_tmp65_);
+				_tmp57_ = page_get_image (_tmp56_, TRUE);
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_height = (_tmp64_ * 72.0) / _tmp66_;
+				image = _tmp57_;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp58_ = image;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp59_ = gdk_pixbuf_get_width (_tmp58_);
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width = _tmp59_;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				depth = 8;
+				_tmp60_ = image;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp61_ = gdk_pixbuf_get_height (_tmp60_);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				height = _tmp61_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp62_ = image;
 #line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp67_ = g_strdup ("DeviceRGB");
+				_tmp63_ = gdk_pixbuf_get_pixels (_tmp62_);
 #line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				color_space = _tmp67_;
+				pixels = _tmp63_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pixels_length1 = -1;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_pixels_size_ = pixels_length1;
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				filter = NULL;
+				_tmp64_ = width;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp65_ = page;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp66_ = page_get_dpi (_tmp65_);
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp67_ = _tmp66_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_width = (_tmp64_ * 72.0) / _tmp67_;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp68_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+				_tmp68_ = height;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = _tmp68_;
+				_tmp69_ = page;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+				_tmp70_ = page_get_dpi (_tmp69_);
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_width_buffer_size_ = width_buffer_length1;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp69_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = _tmp69_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_height_buffer_size_ = height_buffer_length1;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp70_ = page;
+				_tmp71_ = _tmp70_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_height = (_tmp68_ * 72.0) / _tmp71_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				depth = 8;
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp71_ = page_is_color (_tmp70_);
+				_tmp72_ = g_strdup ("DeviceRGB");
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp71_) {
-#line 2241 "book.c"
-					gchar* _tmp72_;
-					gint _tmp73_;
-					gint _tmp74_;
-					gint data_length;
-					gint _tmp75_;
-					guint8* _tmp76_ = NULL;
+				color_space = _tmp72_;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				filter = NULL;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					depth = 8;
+				_tmp73_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width_buffer = _tmp73_;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_width_buffer_size_ = width_buffer_length1;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp72_ = g_strdup ("DeviceRGB");
+				_tmp74_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (color_space);
+				height_buffer = _tmp74_;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					color_space = _tmp72_;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp73_ = height;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp74_ = width;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length = (_tmp73_ * _tmp74_) * 3;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp75_ = data_length;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp76_ = g_new0 (guint8, _tmp75_);
+				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_height_buffer_size_ = height_buffer_length1;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = (g_free (data), NULL);
+				_tmp75_ = page;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = _tmp76_;
+				_tmp76_ = page_get_is_color (_tmp75_);
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length1 = _tmp75_;
+				_tmp77_ = _tmp76_;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (_tmp77_) {
+#line 2241 "book.c"
+					gchar* _tmp78_ = NULL;
+					gint data_length = 0;
+					gint _tmp79_ = 0;
+					gint _tmp80_ = 0;
+					gint _tmp81_ = 0;
+					guint8* _tmp82_ = NULL;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					depth = 8;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp78_ = g_strdup ("DeviceRGB");
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_g_free0 (color_space);
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					color_space = _tmp78_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp79_ = height;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp80_ = width;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data_length = (_tmp79_ * _tmp80_) * 3;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp81_ = data_length;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp82_ = g_new0 (guint8, _tmp81_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data = (g_free (data), NULL);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data = _tmp82_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data_length1 = _tmp81_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_data_size_ = data_length1;
 #line 2274 "book.c"
 					{
-						gint row;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						gint row = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						row = 0;
 #line 2279 "book.c"
 						{
-							gboolean _tmp77_;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp77_ = TRUE;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							gboolean _tmp83_ = FALSE;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp83_ = TRUE;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							while (TRUE) {
 #line 2286 "book.c"
-								gboolean _tmp78_;
-								gint _tmp80_;
-								gint _tmp81_;
-								gint _tmp82_;
-								GdkPixbuf* _tmp83_;
-								gint _tmp84_ = 0;
-								gint in_offset;
-								gint _tmp85_;
-								gint _tmp86_;
-								gint out_offset;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp78_ = _tmp77_;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!_tmp78_) {
+								gboolean _tmp84_ = FALSE;
+								gint _tmp86_ = 0;
+								gint _tmp87_ = 0;
+								gint in_offset = 0;
+								gint _tmp88_ = 0;
+								GdkPixbuf* _tmp89_ = NULL;
+								gint _tmp90_ = 0;
+								gint out_offset = 0;
+								gint _tmp91_ = 0;
+								gint _tmp92_ = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp84_ = _tmp83_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								if (!_tmp84_) {
 #line 2301 "book.c"
-									gint _tmp79_;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp79_ = row;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									row = _tmp79_ + 1;
+									gint _tmp85_ = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp85_ = row;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									row = _tmp85_ + 1;
 #line 2307 "book.c"
 								}
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp77_ = FALSE;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp80_ = row;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp81_ = height;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!(_tmp80_ < _tmp81_)) {
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp83_ = FALSE;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp86_ = row;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp87_ = height;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								if (!(_tmp86_ < _tmp87_)) {
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									break;
 #line 2319 "book.c"
 								}
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp82_ = row;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp83_ = image;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp84_ = gdk_pixbuf_get_rowstride (_tmp83_);
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								in_offset = _tmp82_ * _tmp84_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp85_ = row;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp86_ = width;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								out_offset = (_tmp85_ * _tmp86_) * 3;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp88_ = row;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp89_ = image;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp90_ = gdk_pixbuf_get_rowstride (_tmp89_);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								in_offset = _tmp88_ * _tmp90_;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp91_ = row;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp92_ = width;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								out_offset = (_tmp91_ * _tmp92_) * 3;
 #line 2335 "book.c"
 								{
-									gint x;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									gint x = 0;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									x = 0;
 #line 2340 "book.c"
 									{
-										gboolean _tmp87_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp87_ = TRUE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										gboolean _tmp93_ = FALSE;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp93_ = TRUE;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										while (TRUE) {
 #line 2347 "book.c"
-											gboolean _tmp88_;
-											gint _tmp90_;
-											gint _tmp91_;
-											gint _tmp92_;
-											gint _tmp93_;
-											gint in_o;
-											gint _tmp94_;
-											gint _tmp95_;
-											gint out_o;
-											guint8* _tmp96_;
-											gint _tmp96__length1;
-											gint _tmp97_;
-											guint8* _tmp98_;
-											gint _tmp98__length1;
-											gint _tmp99_;
-											guint8 _tmp100_;
-											guint8 _tmp101_;
-											guint8* _tmp102_;
-											gint _tmp102__length1;
-											gint _tmp103_;
-											guint8* _tmp104_;
-											gint _tmp104__length1;
-											gint _tmp105_;
-											guint8 _tmp106_;
-											guint8 _tmp107_;
-											guint8* _tmp108_;
-											gint _tmp108__length1;
-											gint _tmp109_;
-											guint8* _tmp110_;
-											gint _tmp110__length1;
-											gint _tmp111_;
-											guint8 _tmp112_;
-											guint8 _tmp113_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp88_ = _tmp87_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!_tmp88_) {
-#line 2385 "book.c"
-												gint _tmp89_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp89_ = x;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												x = _tmp89_ + 1;
-#line 2391 "book.c"
-											}
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp87_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp90_ = x;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp91_ = width;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!(_tmp90_ < _tmp91_)) {
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												break;
-#line 2403 "book.c"
-											}
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp92_ = in_offset;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp93_ = x;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											in_o = _tmp92_ + (_tmp93_ * 3);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp94_ = out_offset;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp95_ = x;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											out_o = _tmp94_ + (_tmp95_ * 3);
+											gboolean _tmp94_ = FALSE;
+											gint _tmp96_ = 0;
+											gint _tmp97_ = 0;
+											gint in_o = 0;
+											gint _tmp98_ = 0;
+											gint _tmp99_ = 0;
+											gint out_o = 0;
+											gint _tmp100_ = 0;
+											gint _tmp101_ = 0;
+											guint8* _tmp102_ = NULL;
+											gint _tmp102__length1 = 0;
+											gint _tmp103_ = 0;
+											guint8* _tmp104_ = NULL;
+											gint _tmp104__length1 = 0;
+											gint _tmp105_ = 0;
+											guint8 _tmp106_ = 0U;
+											guint8 _tmp107_ = 0U;
+											guint8* _tmp108_ = NULL;
+											gint _tmp108__length1 = 0;
+											gint _tmp109_ = 0;
+											guint8* _tmp110_ = NULL;
+											gint _tmp110__length1 = 0;
+											gint _tmp111_ = 0;
+											guint8 _tmp112_ = 0U;
+											guint8 _tmp113_ = 0U;
+											guint8* _tmp114_ = NULL;
+											gint _tmp114__length1 = 0;
+											gint _tmp115_ = 0;
+											guint8* _tmp116_ = NULL;
+											gint _tmp116__length1 = 0;
+											gint _tmp117_ = 0;
+											guint8 _tmp118_ = 0U;
+											guint8 _tmp119_ = 0U;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp96_ = data;
+											_tmp94_ = _tmp93_;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp96__length1 = data_length1;
+											if (!_tmp94_) {
+#line 2385 "book.c"
+												gint _tmp95_ = 0;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp97_ = out_o;
+												_tmp95_ = x;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp98_ = pixels;
+												x = _tmp95_ + 1;
+#line 2391 "book.c"
+											}
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp98__length1 = pixels_length1;
+											_tmp93_ = FALSE;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp99_ = in_o;
+											_tmp96_ = x;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp100_ = _tmp98_[_tmp99_];
+											_tmp97_ = width;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp96_[_tmp97_] = _tmp100_;
+											if (!(_tmp96_ < _tmp97_)) {
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp101_ = _tmp96_[_tmp97_];
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												break;
+#line 2403 "book.c"
+											}
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp98_ = in_offset;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp99_ = x;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											in_o = _tmp98_ + (_tmp99_ * 3);
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp100_ = out_offset;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp101_ = x;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											out_o = _tmp100_ + (_tmp101_ * 3);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp102_ = data;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp102__length1 = data_length1;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp103_ = out_o;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp104_ = pixels;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp104__length1 = pixels_length1;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp105_ = in_o;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp106_ = _tmp104_[_tmp105_ + 1];
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp102_[_tmp103_ + 1] = _tmp106_;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp107_ = _tmp102_[_tmp103_ + 1];
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp106_ = _tmp104_[_tmp105_];
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp102_[_tmp103_] = _tmp106_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp107_ = _tmp102_[_tmp103_];
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp108_ = data;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp108__length1 = data_length1;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp109_ = out_o;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110_ = pixels;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110__length1 = pixels_length1;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp111_ = in_o;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp112_ = _tmp110_[_tmp111_ + 2];
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp108_[_tmp109_ + 2] = _tmp112_;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp113_ = _tmp108_[_tmp109_ + 2];
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp112_ = _tmp110_[_tmp111_ + 1];
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp108_[_tmp109_ + 1] = _tmp112_;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp113_ = _tmp108_[_tmp109_ + 1];
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp114_ = data;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp114__length1 = data_length1;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp115_ = out_o;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp116_ = pixels;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp116__length1 = pixels_length1;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp117_ = in_o;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp118_ = _tmp116_[_tmp117_ + 2];
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp114_[_tmp115_ + 2] = _tmp118_;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp119_ = _tmp114_[_tmp115_ + 2];
 #line 2471 "book.c"
 										}
 									}
@@ -2475,298 +2475,301 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						}
 					}
 				} else {
-					Page* _tmp114_;
-					gint _tmp115_ = 0;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp114_ = page;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp115_ = page_get_depth (_tmp114_);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp115_ == 2) {
-#line 2487 "book.c"
-						gint shift_count;
-						gchar* _tmp116_;
-						gint _tmp117_;
-						gint _tmp118_;
-						gint data_length;
-						gint _tmp119_;
-						guint8* _tmp120_ = NULL;
-						gint offset;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						shift_count = 6;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						depth = 2;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp116_ = g_strdup ("DeviceGray");
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_g_free0 (color_space);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						color_space = _tmp116_;
+					Page* _tmp120_ = NULL;
+					gint _tmp121_ = 0;
+					gint _tmp122_ = 0;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp120_ = page;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp117_ = height;
+					_tmp121_ = page_get_depth (_tmp120_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp118_ = width;
+					_tmp122_ = _tmp121_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length = _tmp117_ * (((_tmp118_ * 2) + 7) / 8);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp119_ = data_length;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp120_ = g_new0 (guint8, _tmp119_);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					if (_tmp122_ == 2) {
+#line 2490 "book.c"
+						gint shift_count = 0;
+						gchar* _tmp123_ = NULL;
+						gint data_length = 0;
+						gint _tmp124_ = 0;
+						gint _tmp125_ = 0;
+						gint _tmp126_ = 0;
+						guint8* _tmp127_ = NULL;
+						gint offset = 0;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						shift_count = 6;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						depth = 2;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp123_ = g_strdup ("DeviceGray");
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_g_free0 (color_space);
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						color_space = _tmp123_;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp124_ = height;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp125_ = width;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length = _tmp124_ * (((_tmp125_ * 2) + 7) / 8);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp126_ = data_length;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp127_ = g_new0 (guint8, _tmp126_);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp120_;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp119_;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data = _tmp127_;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length1 = _tmp126_;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						offset = 0;
-#line 2526 "book.c"
+#line 2529 "book.c"
 						{
-							gint row;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							gint row = 0;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							row = 0;
-#line 2531 "book.c"
+#line 2534 "book.c"
 							{
-								gboolean _tmp121_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp121_ = TRUE;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								gboolean _tmp128_ = FALSE;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp128_ = TRUE;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								while (TRUE) {
-#line 2538 "book.c"
-									gboolean _tmp122_;
-									gint _tmp124_;
-									gint _tmp125_;
-									gint _tmp126_;
-									gint _tmp128_;
-									GdkPixbuf* _tmp129_;
-									gint _tmp130_ = 0;
-									gint in_offset;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp122_ = _tmp121_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!_tmp122_) {
-#line 2551 "book.c"
-										gint _tmp123_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp123_ = row;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										row = _tmp123_ + 1;
-#line 2557 "book.c"
-									}
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp121_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp124_ = row;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp125_ = height;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!(_tmp124_ < _tmp125_)) {
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										break;
-#line 2569 "book.c"
+#line 2541 "book.c"
+									gboolean _tmp129_ = FALSE;
+									gint _tmp131_ = 0;
+									gint _tmp132_ = 0;
+									gint _tmp133_ = 0;
+									gint in_offset = 0;
+									gint _tmp135_ = 0;
+									GdkPixbuf* _tmp136_ = NULL;
+									gint _tmp137_ = 0;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp129_ = _tmp128_;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									if (!_tmp129_) {
+#line 2554 "book.c"
+										gint _tmp130_ = 0;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp130_ = row;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										row = _tmp130_ + 1;
+#line 2560 "book.c"
 									}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp126_ = shift_count;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (_tmp126_ != 6) {
-#line 2575 "book.c"
-										gint _tmp127_;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp127_ = offset;
+									_tmp128_ = FALSE;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp131_ = row;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										offset = _tmp127_ + 1;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp132_ = height;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									if (!(_tmp131_ < _tmp132_)) {
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										break;
+#line 2572 "book.c"
+									}
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp133_ = shift_count;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									if (_tmp133_ != 6) {
+#line 2578 "book.c"
+										gint _tmp134_ = 0;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp134_ = offset;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										offset = _tmp134_ + 1;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										shift_count = 6;
-#line 2583 "book.c"
+#line 2586 "book.c"
 									}
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp128_ = row;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp129_ = image;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp130_ = gdk_pixbuf_get_rowstride (_tmp129_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									in_offset = _tmp128_ * _tmp130_;
-#line 2593 "book.c"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp135_ = row;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp136_ = image;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp137_ = gdk_pixbuf_get_rowstride (_tmp136_);
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									in_offset = _tmp135_ * _tmp137_;
+#line 2596 "book.c"
 									{
-										gint x;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										gint x = 0;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										x = 0;
-#line 2598 "book.c"
+#line 2601 "book.c"
 										{
-											gboolean _tmp131_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp131_ = TRUE;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											gboolean _tmp138_ = FALSE;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp138_ = TRUE;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											while (TRUE) {
-#line 2605 "book.c"
-												gboolean _tmp132_;
-												gint _tmp134_;
-												gint _tmp135_;
-												gint _tmp136_;
-												guint8* _tmp140_;
-												gint _tmp140__length1;
-												gint _tmp141_;
-												gint _tmp142_;
-												guint8 _tmp143_;
-												guint8 p;
-												guint8 _tmp144_;
-												gint _tmp159_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp132_ = _tmp131_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!_tmp132_) {
-#line 2622 "book.c"
-													gint _tmp133_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp133_ = x;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													x = _tmp133_ + 1;
-#line 2628 "book.c"
+#line 2608 "book.c"
+												gboolean _tmp139_ = FALSE;
+												gint _tmp141_ = 0;
+												gint _tmp142_ = 0;
+												gint _tmp143_ = 0;
+												guint8 p = 0U;
+												guint8* _tmp147_ = NULL;
+												gint _tmp147__length1 = 0;
+												gint _tmp148_ = 0;
+												gint _tmp149_ = 0;
+												guint8 _tmp150_ = 0U;
+												guint8 _tmp151_ = 0U;
+												gint _tmp166_ = 0;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp139_ = _tmp138_;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (!_tmp139_) {
+#line 2625 "book.c"
+													gint _tmp140_ = 0;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp140_ = x;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													x = _tmp140_ + 1;
+#line 2631 "book.c"
 												}
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp131_ = FALSE;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp134_ = x;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp135_ = width;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!(_tmp134_ < _tmp135_)) {
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp138_ = FALSE;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp141_ = x;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp142_ = width;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (!(_tmp141_ < _tmp142_)) {
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													break;
-#line 2640 "book.c"
-												}
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp136_ = shift_count;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp136_ == 6) {
-#line 2646 "book.c"
-													guint8* _tmp137_;
-													gint _tmp137__length1;
-													gint _tmp138_;
-													guint8 _tmp139_;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp137_ = data;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp137__length1 = data_length1;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp138_ = offset;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp137_[_tmp138_] = (guint8) 0;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp139_ = _tmp137_[_tmp138_];
-#line 2661 "book.c"
+#line 2643 "book.c"
 												}
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp140_ = pixels;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp140__length1 = pixels_length1;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp141_ = in_offset;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp142_ = x;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp143_ = _tmp140_[_tmp141_ + (_tmp142_ * 3)];
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												p = _tmp143_;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp144_ = p;
+												_tmp143_ = shift_count;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (((gint) _tmp144_) >= 192) {
-#line 2679 "book.c"
-													guint8* _tmp145_;
-													gint _tmp145__length1;
-													gint _tmp146_;
-													gint _tmp147_;
-													guint8 _tmp148_;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp145_ = data;
+												if (_tmp143_ == 6) {
+#line 2649 "book.c"
+													guint8* _tmp144_ = NULL;
+													gint _tmp144__length1 = 0;
+													gint _tmp145_ = 0;
+													guint8 _tmp146_ = 0U;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp145__length1 = data_length1;
+													_tmp144_ = data;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp146_ = offset;
+													_tmp144__length1 = data_length1;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp147_ = shift_count;
+													_tmp145_ = offset;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp145_[_tmp146_] |= (guint8) (3 << _tmp147_);
+													_tmp144_[_tmp145_] = (guint8) 0;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp148_ = _tmp145_[_tmp146_];
-#line 2697 "book.c"
-												} else {
-													guint8 _tmp149_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp149_ = p;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp149_) >= 128) {
-#line 2704 "book.c"
-														guint8* _tmp150_;
-														gint _tmp150__length1;
-														gint _tmp151_;
-														gint _tmp152_;
-														guint8 _tmp153_;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp150_ = data;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp150__length1 = data_length1;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp151_ = offset;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp152_ = shift_count;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp150_[_tmp151_] |= (guint8) (2 << _tmp152_);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp153_ = _tmp150_[_tmp151_];
-#line 2722 "book.c"
-													} else {
-														guint8 _tmp154_;
+													_tmp146_ = _tmp144_[_tmp145_];
+#line 2664 "book.c"
+												}
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp154_ = p;
+												_tmp147_ = pixels;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														if (((gint) _tmp154_) >= 64) {
-#line 2729 "book.c"
-															guint8* _tmp155_;
-															gint _tmp155__length1;
-															gint _tmp156_;
-															gint _tmp157_;
-															guint8 _tmp158_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp155_ = data;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp155__length1 = data_length1;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp156_ = offset;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp157_ = shift_count;
+												_tmp147__length1 = pixels_length1;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp148_ = in_offset;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp149_ = x;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp150_ = _tmp147_[_tmp148_ + (_tmp149_ * 3)];
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												p = _tmp150_;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp155_[_tmp156_] |= (guint8) (1 << _tmp157_);
+												_tmp151_ = p;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp158_ = _tmp155_[_tmp156_];
-#line 2747 "book.c"
-														}
-													}
-												}
+												if (((gint) _tmp151_) >= 192) {
+#line 2682 "book.c"
+													guint8* _tmp152_ = NULL;
+													gint _tmp152__length1 = 0;
+													gint _tmp153_ = 0;
+													gint _tmp154_ = 0;
+													guint8 _tmp155_ = 0U;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp152_ = data;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp152__length1 = data_length1;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp153_ = offset;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp154_ = shift_count;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp152_[_tmp153_] |= (guint8) (3 << _tmp154_);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp155_ = _tmp152_[_tmp153_];
+#line 2700 "book.c"
+												} else {
+													guint8 _tmp156_ = 0U;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp156_ = p;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (((gint) _tmp156_) >= 128) {
+#line 2707 "book.c"
+														guint8* _tmp157_ = NULL;
+														gint _tmp157__length1 = 0;
+														gint _tmp158_ = 0;
+														gint _tmp159_ = 0;
+														guint8 _tmp160_ = 0U;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp157_ = data;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp157__length1 = data_length1;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp159_ = shift_count;
+														_tmp158_ = offset;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp159_ == 0) {
-#line 2755 "book.c"
-													gint _tmp160_;
+														_tmp159_ = shift_count;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp157_[_tmp158_] |= (guint8) (2 << _tmp159_);
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp160_ = _tmp157_[_tmp158_];
+#line 2725 "book.c"
+													} else {
+														guint8 _tmp161_ = 0U;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp161_ = p;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														if (((gint) _tmp161_) >= 64) {
+#line 2732 "book.c"
+															guint8* _tmp162_ = NULL;
+															gint _tmp162__length1 = 0;
+															gint _tmp163_ = 0;
+															gint _tmp164_ = 0;
+															guint8 _tmp165_ = 0U;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp162_ = data;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp162__length1 = data_length1;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp163_ = offset;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp160_ = offset;
+															_tmp164_ = shift_count;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													offset = _tmp160_ + 1;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp162_[_tmp163_] |= (guint8) (1 << _tmp164_);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp165_ = _tmp162_[_tmp163_];
+#line 2750 "book.c"
+														}
+													}
+												}
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp166_ = shift_count;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (_tmp166_ == 0) {
+#line 2758 "book.c"
+													gint _tmp167_ = 0;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp167_ = offset;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													offset = _tmp167_ + 1;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													shift_count = 6;
-#line 2763 "book.c"
+#line 2766 "book.c"
 												} else {
-													gint _tmp161_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp161_ = shift_count;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													shift_count = _tmp161_ - 2;
-#line 2770 "book.c"
+													gint _tmp168_ = 0;
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp168_ = shift_count;
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													shift_count = _tmp168_ - 2;
+#line 2773 "book.c"
 												}
 											}
 										}
@@ -2775,238 +2778,241 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 							}
 						}
 					} else {
-						Page* _tmp162_;
-						gint _tmp163_ = 0;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp162_ = page;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp163_ = page_get_depth (_tmp162_);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp163_ == 1) {
-#line 2787 "book.c"
-							gint mask;
-							gchar* _tmp164_;
-							gint _tmp165_;
-							gint _tmp166_;
-							gint data_length;
-							gint _tmp167_;
-							guint8* _tmp168_ = NULL;
-							gint offset;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							mask = 0x80;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							depth = 1;
+						Page* _tmp169_ = NULL;
+						gint _tmp170_ = 0;
+						gint _tmp171_ = 0;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp164_ = g_strdup ("DeviceGray");
+						_tmp169_ = page;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (color_space);
+						_tmp170_ = page_get_depth (_tmp169_);
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp164_;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp165_ = height;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp166_ = width;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp165_ * ((_tmp166_ + 7) / 8);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp167_ = data_length;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp168_ = g_new0 (guint8, _tmp167_);
+						_tmp171_ = _tmp170_;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						if (_tmp171_ == 1) {
+#line 2793 "book.c"
+							gint mask = 0;
+							gchar* _tmp172_ = NULL;
+							gint data_length = 0;
+							gint _tmp173_ = 0;
+							gint _tmp174_ = 0;
+							gint _tmp175_ = 0;
+							guint8* _tmp176_ = NULL;
+							gint offset = 0;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							mask = 0x80;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							depth = 1;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp172_ = g_strdup ("DeviceGray");
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_g_free0 (color_space);
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							color_space = _tmp172_;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp173_ = height;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp174_ = width;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length = _tmp173_ * ((_tmp174_ + 7) / 8);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp175_ = data_length;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp176_ = g_new0 (guint8, _tmp175_);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp168_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp167_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = _tmp176_;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length1 = _tmp175_;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							offset = 0;
-#line 2826 "book.c"
+#line 2832 "book.c"
 							{
-								gint row;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								gint row = 0;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
-#line 2831 "book.c"
+#line 2837 "book.c"
 								{
-									gboolean _tmp169_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp169_ = TRUE;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									gboolean _tmp177_ = FALSE;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp177_ = TRUE;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
-#line 2838 "book.c"
-										gboolean _tmp170_;
-										gint _tmp172_;
-										gint _tmp173_;
-										gint _tmp174_;
-										gint _tmp176_;
-										GdkPixbuf* _tmp177_;
-										gint _tmp178_ = 0;
-										gint in_offset;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp170_ = _tmp169_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp170_) {
-#line 2851 "book.c"
-											gint _tmp171_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp171_ = row;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp171_ + 1;
+#line 2844 "book.c"
+										gboolean _tmp178_ = FALSE;
+										gint _tmp180_ = 0;
+										gint _tmp181_ = 0;
+										gint _tmp182_ = 0;
+										gint in_offset = 0;
+										gint _tmp184_ = 0;
+										GdkPixbuf* _tmp185_ = NULL;
+										gint _tmp186_ = 0;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp178_ = _tmp177_;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (!_tmp178_) {
 #line 2857 "book.c"
+											gint _tmp179_ = 0;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp179_ = row;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											row = _tmp179_ + 1;
+#line 2863 "book.c"
 										}
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp169_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp172_ = row;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp173_ = height;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp172_ < _tmp173_)) {
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											break;
-#line 2869 "book.c"
-										}
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp174_ = mask;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (_tmp174_ != 0x80) {
-#line 2875 "book.c"
-											gint _tmp175_;
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp175_ = offset;
+										_tmp177_ = FALSE;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp180_ = row;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp181_ = height;
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											offset = _tmp175_ + 1;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (!(_tmp180_ < _tmp181_)) {
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											break;
+#line 2875 "book.c"
+										}
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp182_ = mask;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (_tmp182_ != 0x80) {
+#line 2881 "book.c"
+											gint _tmp183_ = 0;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp183_ = offset;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											offset = _tmp183_ + 1;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											mask = 0x80;
-#line 2883 "book.c"
+#line 2889 "book.c"
 										}
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp176_ = row;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp177_ = image;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp178_ = gdk_pixbuf_get_rowstride (_tmp177_);
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp176_ * _tmp178_;
-#line 2893 "book.c"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp184_ = row;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp185_ = image;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp186_ = gdk_pixbuf_get_rowstride (_tmp185_);
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										in_offset = _tmp184_ * _tmp186_;
+#line 2899 "book.c"
 										{
-											gint x;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											gint x = 0;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
-#line 2898 "book.c"
+#line 2904 "book.c"
 											{
-												gboolean _tmp179_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp179_ = TRUE;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												gboolean _tmp187_ = FALSE;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp187_ = TRUE;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												while (TRUE) {
-#line 2905 "book.c"
-													gboolean _tmp180_;
-													gint _tmp182_;
-													gint _tmp183_;
-													gint _tmp184_;
-													guint8* _tmp188_;
-													gint _tmp188__length1;
-													gint _tmp189_;
-													gint _tmp190_;
-													guint8 _tmp191_;
-													gint _tmp196_;
-													gint _tmp197_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp180_ = _tmp179_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp180_) {
-#line 2921 "book.c"
-														gint _tmp181_;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp181_ = x;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp181_ + 1;
+#line 2911 "book.c"
+													gboolean _tmp188_ = FALSE;
+													gint _tmp190_ = 0;
+													gint _tmp191_ = 0;
+													gint _tmp192_ = 0;
+													guint8* _tmp196_ = NULL;
+													gint _tmp196__length1 = 0;
+													gint _tmp197_ = 0;
+													gint _tmp198_ = 0;
+													guint8 _tmp199_ = 0U;
+													gint _tmp204_ = 0;
+													gint _tmp205_ = 0;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp188_ = _tmp187_;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!_tmp188_) {
 #line 2927 "book.c"
+														gint _tmp189_ = 0;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp189_ = x;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														x = _tmp189_ + 1;
+#line 2933 "book.c"
 													}
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp179_ = FALSE;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp182_ = x;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp183_ = width;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp182_ < _tmp183_)) {
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp187_ = FALSE;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp190_ = x;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp191_ = width;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!(_tmp190_ < _tmp191_)) {
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														break;
-#line 2939 "book.c"
-													}
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp184_ = mask;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp184_ == 0x80) {
 #line 2945 "book.c"
-														guint8* _tmp185_;
-														gint _tmp185__length1;
-														gint _tmp186_;
-														guint8 _tmp187_;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp185_ = data;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp185__length1 = data_length1;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp186_ = offset;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp185_[_tmp186_] = (guint8) 0;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp187_ = _tmp185_[_tmp186_];
-#line 2960 "book.c"
 													}
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp188_ = pixels;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp188__length1 = pixels_length1;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp189_ = in_offset;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp190_ = x;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp191_ = _tmp188_[_tmp189_ + (_tmp190_ * 3)];
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp191_) != 0) {
-#line 2974 "book.c"
-														guint8* _tmp192_;
-														gint _tmp192__length1;
-														gint _tmp193_;
-														gint _tmp194_;
-														guint8 _tmp195_;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp192_ = data;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp192__length1 = data_length1;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp193_ = offset;
+													_tmp192_ = mask;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp194_ = mask;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp192_[_tmp193_] |= (guint8) _tmp194_;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp195_ = _tmp192_[_tmp193_];
-#line 2992 "book.c"
+													if (_tmp192_ == 0x80) {
+#line 2951 "book.c"
+														guint8* _tmp193_ = NULL;
+														gint _tmp193__length1 = 0;
+														gint _tmp194_ = 0;
+														guint8 _tmp195_ = 0U;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp193_ = data;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp193__length1 = data_length1;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp194_ = offset;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp193_[_tmp194_] = (guint8) 0;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp195_ = _tmp193_[_tmp194_];
+#line 2966 "book.c"
 													}
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp196_ = mask;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													mask = _tmp196_ >> 1;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp197_ = mask;
+													_tmp196_ = pixels;
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp196__length1 = pixels_length1;
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp197_ = in_offset;
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp198_ = x;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp197_ == 0) {
-#line 3002 "book.c"
-														gint _tmp198_;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp198_ = offset;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														offset = _tmp198_ + 1;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp199_ = _tmp196_[_tmp197_ + (_tmp198_ * 3)];
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (((gint) _tmp199_) != 0) {
+#line 2980 "book.c"
+														guint8* _tmp200_ = NULL;
+														gint _tmp200__length1 = 0;
+														gint _tmp201_ = 0;
+														gint _tmp202_ = 0;
+														guint8 _tmp203_ = 0U;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp200_ = data;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp200__length1 = data_length1;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp201_ = offset;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp202_ = mask;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp200_[_tmp201_] |= (guint8) _tmp202_;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp203_ = _tmp200_[_tmp201_];
+#line 2998 "book.c"
+													}
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp204_ = mask;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													mask = _tmp204_ >> 1;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp205_ = mask;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (_tmp205_ == 0) {
+#line 3008 "book.c"
+														gint _tmp206_ = 0;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp206_ = offset;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														offset = _tmp206_ + 1;
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														mask = 0x80;
-#line 3010 "book.c"
+#line 3016 "book.c"
 													}
 												}
 											}
@@ -3015,172 +3021,172 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 								}
 							}
 						} else {
-							gchar* _tmp199_;
-							gint _tmp200_;
-							gint _tmp201_;
-							gint data_length;
-							gint _tmp202_;
-							guint8* _tmp203_ = NULL;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							gchar* _tmp207_ = NULL;
+							gint data_length = 0;
+							gint _tmp208_ = 0;
+							gint _tmp209_ = 0;
+							gint _tmp210_ = 0;
+							guint8* _tmp211_ = NULL;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 8;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp199_ = g_strdup ("DeviceGray");
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (color_space);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp199_;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp200_ = height;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp201_ = width;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp200_ * _tmp201_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp202_ = data_length;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp203_ = g_new0 (guint8, _tmp202_);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp203_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp202_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
-#line 3051 "book.c"
-							{
-								gint row;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								row = 0;
-#line 3056 "book.c"
-								{
-									gboolean _tmp204_;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp204_ = TRUE;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									while (TRUE) {
-#line 3063 "book.c"
-										gboolean _tmp205_;
-										gint _tmp207_;
-										gint _tmp208_;
-										gint _tmp209_;
-										GdkPixbuf* _tmp210_;
-										gint _tmp211_ = 0;
-										gint in_offset;
-										gint _tmp212_;
-										gint _tmp213_;
-										gint out_offset;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp205_ = _tmp204_;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp205_) {
-#line 3078 "book.c"
-											gint _tmp206_;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp206_ = row;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp206_ + 1;
-#line 3084 "book.c"
-										}
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp204_ = FALSE;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp207_ = row;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp208_ = height;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp207_ < _tmp208_)) {
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											break;
-#line 3096 "book.c"
-										}
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp209_ = row;
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp210_ = image;
+							_tmp207_ = g_strdup ("DeviceGray");
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp211_ = gdk_pixbuf_get_rowstride (_tmp210_);
+							_g_free0 (color_space);
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp209_ * _tmp211_;
+							color_space = _tmp207_;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp212_ = row;
+							_tmp208_ = height;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp213_ = width;
+							_tmp209_ = width;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										out_offset = _tmp212_ * _tmp213_;
-#line 3112 "book.c"
-										{
-											gint x;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											x = 0;
-#line 3117 "book.c"
-											{
-												gboolean _tmp214_;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp214_ = TRUE;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												while (TRUE) {
-#line 3124 "book.c"
-													gboolean _tmp215_;
-													gint _tmp217_;
-													gint _tmp218_;
-													guint8* _tmp219_;
-													gint _tmp219__length1;
-													gint _tmp220_;
-													gint _tmp221_;
-													guint8* _tmp222_;
-													gint _tmp222__length1;
-													gint _tmp223_;
-													gint _tmp224_;
-													guint8 _tmp225_;
-													guint8 _tmp226_;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp215_ = _tmp214_;
+							data_length = _tmp208_ * _tmp209_;
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp215_) {
-#line 3142 "book.c"
-														gint _tmp216_;
+							_tmp210_ = data_length;
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp216_ = x;
+							_tmp211_ = g_new0 (guint8, _tmp210_);
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp216_ + 1;
-#line 3148 "book.c"
-													}
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp214_ = FALSE;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp217_ = x;
+							data = (g_free (data), NULL);
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp218_ = width;
+							data = _tmp211_;
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp217_ < _tmp218_)) {
+							data_length1 = _tmp210_;
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														break;
-#line 3160 "book.c"
-													}
+							_data_size_ = data_length1;
+#line 3057 "book.c"
+							{
+								gint row = 0;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp219_ = data;
+								row = 0;
+#line 3062 "book.c"
+								{
+									gboolean _tmp212_ = FALSE;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp219__length1 = data_length1;
+									_tmp212_ = TRUE;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp220_ = out_offset;
+									while (TRUE) {
+#line 3069 "book.c"
+										gboolean _tmp213_ = FALSE;
+										gint _tmp215_ = 0;
+										gint _tmp216_ = 0;
+										gint in_offset = 0;
+										gint _tmp217_ = 0;
+										GdkPixbuf* _tmp218_ = NULL;
+										gint _tmp219_ = 0;
+										gint out_offset = 0;
+										gint _tmp220_ = 0;
+										gint _tmp221_ = 0;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp221_ = x;
+										_tmp213_ = _tmp212_;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp222_ = pixels;
+										if (!_tmp213_) {
+#line 3084 "book.c"
+											gint _tmp214_ = 0;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp214_ = row;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp222__length1 = pixels_length1;
+											row = _tmp214_ + 1;
+#line 3090 "book.c"
+										}
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp223_ = in_offset;
+										_tmp212_ = FALSE;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp224_ = x;
+										_tmp215_ = row;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp225_ = _tmp222_[_tmp223_ + (_tmp224_ * 3)];
+										_tmp216_ = height;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp219_[_tmp220_ + _tmp221_] = _tmp225_;
+										if (!(_tmp215_ < _tmp216_)) {
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp226_ = _tmp219_[_tmp220_ + _tmp221_];
-#line 3184 "book.c"
+											break;
+#line 3102 "book.c"
+										}
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp217_ = row;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp218_ = image;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp219_ = gdk_pixbuf_get_rowstride (_tmp218_);
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										in_offset = _tmp217_ * _tmp219_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp220_ = row;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp221_ = width;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										out_offset = _tmp220_ * _tmp221_;
+#line 3118 "book.c"
+										{
+											gint x = 0;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											x = 0;
+#line 3123 "book.c"
+											{
+												gboolean _tmp222_ = FALSE;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp222_ = TRUE;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												while (TRUE) {
+#line 3130 "book.c"
+													gboolean _tmp223_ = FALSE;
+													gint _tmp225_ = 0;
+													gint _tmp226_ = 0;
+													guint8* _tmp227_ = NULL;
+													gint _tmp227__length1 = 0;
+													gint _tmp228_ = 0;
+													gint _tmp229_ = 0;
+													guint8* _tmp230_ = NULL;
+													gint _tmp230__length1 = 0;
+													gint _tmp231_ = 0;
+													gint _tmp232_ = 0;
+													guint8 _tmp233_ = 0U;
+													guint8 _tmp234_ = 0U;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp223_ = _tmp222_;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!_tmp223_) {
+#line 3148 "book.c"
+														gint _tmp224_ = 0;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp224_ = x;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														x = _tmp224_ + 1;
+#line 3154 "book.c"
+													}
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp222_ = FALSE;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp225_ = x;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp226_ = width;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!(_tmp225_ < _tmp226_)) {
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														break;
+#line 3166 "book.c"
+													}
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp227_ = data;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp227__length1 = data_length1;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp228_ = out_offset;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp229_ = x;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp230_ = pixels;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp230__length1 = pixels_length1;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp231_ = in_offset;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp232_ = x;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp233_ = _tmp230_[_tmp231_ + (_tmp232_ * 3)];
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp227_[_tmp228_ + _tmp229_] = _tmp233_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp234_ = _tmp227_[_tmp228_ + _tmp229_];
+#line 3190 "book.c"
 												}
 											}
 										}
@@ -3190,848 +3196,866 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						}
 					}
 				}
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp227_ = data;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp227__length1 = data_length1;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp229_ = book_compress_zlib (self, _tmp227_, _tmp227__length1, &_tmp228_);
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = _tmp229_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data_length1 = _tmp228_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp235_ = data;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp235__length1 = data_length1;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp237_ = book_compress_zlib (self, _tmp235_, _tmp235__length1, &_tmp236_);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				compressed_data = _tmp237_;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				compressed_data_length1 = _tmp236_;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_compressed_data_size_ = compressed_data_length1;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp230_ = compressed_data;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp230__length1 = compressed_data_length1;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp230_ != NULL) {
-#line 3212 "book.c"
-					gint _tmp231_;
-					const gchar* _tmp243_;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp231_ = depth;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp231_ > 1) {
-#line 3219 "book.c"
-						GdkPixbuf* _tmp232_;
-						gint _tmp233_;
-						Page* _tmp234_;
-						gint _tmp235_ = 0;
-						gint _tmp236_ = 0;
-						guint8* _tmp237_ = NULL;
-						guint8* jpeg_data;
-						gint jpeg_data_length1;
-						gint _jpeg_data_size_;
-						guint8* _tmp238_;
-						gint _tmp238__length1;
-						guint8* _tmp239_;
-						gint _tmp239__length1;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp232_ = image;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp233_ = quality;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp234_ = page;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp235_ = page_get_dpi (_tmp234_);
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp237_ = book_compress_jpeg (self, _tmp232_, _tmp233_, _tmp235_, &_tmp236_);
+				_tmp238_ = compressed_data;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = _tmp237_;
+				_tmp238__length1 = compressed_data_length1;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data_length1 = _tmp236_;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_jpeg_data_size_ = jpeg_data_length1;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp238_ = jpeg_data;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp238__length1 = jpeg_data_length1;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp239_ = compressed_data;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp239__length1 = compressed_data_length1;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp238__length1 < _tmp239__length1) {
-#line 3259 "book.c"
-							gchar* _tmp240_;
-							guint8* _tmp241_;
-							gint _tmp241__length1;
-							guint8* _tmp242_;
-							gint _tmp242__length1;
+				if (_tmp238_ != NULL) {
+#line 3218 "book.c"
+					gint _tmp239_ = 0;
+					const gchar* _tmp252_ = NULL;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp240_ = g_strdup ("DCTDecode");
+					_tmp239_ = depth;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					if (_tmp239_ > 1) {
+#line 3225 "book.c"
+						guint8* jpeg_data = NULL;
+						GdkPixbuf* _tmp240_ = NULL;
+						gint _tmp241_ = 0;
+						Page* _tmp242_ = NULL;
+						gint _tmp243_ = 0;
+						gint _tmp244_ = 0;
+						gint _tmp245_ = 0;
+						guint8* _tmp246_ = NULL;
+						gint jpeg_data_length1 = 0;
+						gint _jpeg_data_size_ = 0;
+						guint8* _tmp247_ = NULL;
+						gint _tmp247__length1 = 0;
+						guint8* _tmp248_ = NULL;
+						gint _tmp248__length1 = 0;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp240_ = image;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp241_ = quality;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp242_ = page;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp243_ = page_get_dpi (_tmp242_);
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp244_ = _tmp243_;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp246_ = book_compress_jpeg (self, _tmp240_, _tmp241_, _tmp244_, &_tmp245_);
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						jpeg_data = _tmp246_;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						jpeg_data_length1 = _tmp245_;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_jpeg_data_size_ = jpeg_data_length1;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp247_ = jpeg_data;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp247__length1 = jpeg_data_length1;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp248_ = compressed_data;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp248__length1 = compressed_data_length1;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						if (_tmp247__length1 < _tmp248__length1) {
+#line 3268 "book.c"
+							gchar* _tmp249_ = NULL;
+							guint8* _tmp250_ = NULL;
+							gint _tmp250__length1 = 0;
+							guint8* _tmp251_ = NULL;
+							gint _tmp251__length1 = 0;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp249_ = g_strdup ("DCTDecode");
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (filter);
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							filter = _tmp240_;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp241_ = jpeg_data;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp241__length1 = jpeg_data_length1;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp242_ = (_tmp241_ != NULL) ? _vala_array_dup1 (_tmp241_, _tmp241__length1) : ((gpointer) _tmp241_);
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp242__length1 = _tmp241__length1;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							filter = _tmp249_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp250_ = jpeg_data;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp250__length1 = jpeg_data_length1;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp251_ = (_tmp250_ != NULL) ? _vala_array_dup1 (_tmp250_, _tmp250__length1) : ((gpointer) _tmp250_);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp251__length1 = _tmp250__length1;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp242_;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp242__length1;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = _tmp251_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length1 = _tmp251__length1;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
-#line 3287 "book.c"
+#line 3296 "book.c"
 						}
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						jpeg_data = (g_free (jpeg_data), NULL);
-#line 3291 "book.c"
+#line 3300 "book.c"
 					}
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp243_ = filter;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp243_ == NULL) {
-#line 3297 "book.c"
-						gchar* _tmp244_;
-						guint8* _tmp245_;
-						gint _tmp245__length1;
-						guint8* _tmp246_;
-						gint _tmp246__length1;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp244_ = g_strdup ("FlateDecode");
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp252_ = filter;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					if (_tmp252_ == NULL) {
+#line 3306 "book.c"
+						gchar* _tmp253_ = NULL;
+						guint8* _tmp254_ = NULL;
+						gint _tmp254__length1 = 0;
+						guint8* _tmp255_ = NULL;
+						gint _tmp255__length1 = 0;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp253_ = g_strdup ("FlateDecode");
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_g_free0 (filter);
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						filter = _tmp244_;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp245_ = compressed_data;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp245__length1 = compressed_data_length1;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp246_ = (_tmp245_ != NULL) ? _vala_array_dup2 (_tmp245_, _tmp245__length1) : ((gpointer) _tmp245_);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp246__length1 = _tmp245__length1;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						filter = _tmp253_;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp254_ = compressed_data;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp254__length1 = compressed_data_length1;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp255_ = (_tmp254_ != NULL) ? _vala_array_dup2 (_tmp254_, _tmp254__length1) : ((gpointer) _tmp254_);
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp255__length1 = _tmp254__length1;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp246_;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp246__length1;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data = _tmp255_;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length1 = _tmp255__length1;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
-#line 3325 "book.c"
+#line 3334 "book.c"
 					}
 				}
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp247_ = writer;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp247_, "\n");
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp248_ = writer;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp249_ = pdf_writer_start_object (_tmp248_);
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp249_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp250_ = writer;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp251_ = number;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp252_ = g_strdup_printf ("%u 0 obj\n", _tmp251_);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp253_ = _tmp252_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp250_, _tmp253_);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp253_);
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp254_ = writer;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp254_, "<<\n");
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp255_ = writer;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp255_, "/Type /Page\n");
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp256_ = writer;
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp257_ = pages_number;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp258_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp257_);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp259_ = _tmp258_;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp256_, _tmp259_);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp259_);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp260_ = writer;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp261_ = i;
+				pdf_writer_write_string (_tmp256_, "\n");
 #line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp262_ = number;
+				_tmp257_ = writer;
 #line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp263_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp261_, _tmp262_ + 1);
+				_tmp258_ = pdf_writer_start_object (_tmp257_);
 #line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp264_ = _tmp263_;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp260_, _tmp264_);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp264_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp265_ = writer;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp266_ = page_width;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp267_ = width_buffer;
+				number = _tmp258_;
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp267__length1 = width_buffer_length1;
+				_tmp259_ = writer;
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp268_ = g_ascii_formatd (_tmp267_, _tmp267__length1, "%.2f", _tmp266_);
+				_tmp260_ = number;
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp269_ = page_height;
+				_tmp261_ = g_strdup_printf ("%u 0 obj\n", _tmp260_);
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp270_ = height_buffer;
+				_tmp262_ = _tmp261_;
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp270__length1 = height_buffer_length1;
+				pdf_writer_write_string (_tmp259_, _tmp262_);
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp271_ = g_ascii_formatd (_tmp270_, _tmp270__length1, "%.2f", _tmp269_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp272_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp268_, _tmp271_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp273_ = _tmp272_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp265_, _tmp273_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp273_);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp274_ = writer;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp275_ = number;
+				_g_free0 (_tmp262_);
 #line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp276_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp275_ + 2);
+				_tmp263_ = writer;
 #line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp277_ = _tmp276_;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp274_, _tmp277_);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp277_);
+				pdf_writer_write_string (_tmp263_, "<<\n");
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp278_ = writer;
+				_tmp264_ = writer;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp278_, ">>\n");
+				pdf_writer_write_string (_tmp264_, "/Type /Page\n");
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp279_ = writer;
+				_tmp265_ = writer;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp279_, "endobj\n");
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp280_ = writer;
+				_tmp266_ = pages_number;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp267_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp266_);
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp268_ = _tmp267_;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp265_, _tmp268_);
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp268_);
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp269_ = writer;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp270_ = i;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp271_ = number;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp272_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp270_, _tmp271_ + 1);
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp273_ = _tmp272_;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp269_, _tmp273_);
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp273_);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp274_ = writer;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp275_ = page_width;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp276_ = width_buffer;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp276__length1 = width_buffer_length1;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp277_ = g_ascii_formatd (_tmp276_, _tmp276__length1, "%.2f", _tmp275_);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp278_ = page_height;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp279_ = height_buffer;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp279__length1 = height_buffer_length1;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp280_ = g_ascii_formatd (_tmp279_, _tmp279__length1, "%.2f", _tmp278_);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp281_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp277_, _tmp280_);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp282_ = _tmp281_;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp274_, _tmp282_);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp282_);
 #line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp280_, "\n");
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp281_ = writer;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp282_ = pdf_writer_start_object (_tmp281_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp282_;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp283_ = writer;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp284_ = number;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp285_ = g_strdup_printf ("%u 0 obj\n", _tmp284_);
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp285_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp284_ + 2);
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp286_ = _tmp285_;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp283_, _tmp286_);
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp286_);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp287_ = writer;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp287_, "<<\n");
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp287_, ">>\n");
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp288_ = writer;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp288_, "/Type /XObject\n");
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp288_, "endobj\n");
 #line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp289_ = writer;
 #line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp289_, "/Subtype /Image\n");
+				pdf_writer_write_string (_tmp289_, "\n");
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp290_ = writer;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp291_ = width;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp292_ = g_strdup_printf ("/Width %d\n", _tmp291_);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp293_ = _tmp292_;
+				_tmp291_ = pdf_writer_start_object (_tmp290_);
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp290_, _tmp293_);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp293_);
+				number = _tmp291_;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp294_ = writer;
+				_tmp292_ = writer;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp295_ = height;
+				_tmp293_ = number;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp296_ = g_strdup_printf ("/Height %d\n", _tmp295_);
+				_tmp294_ = g_strdup_printf ("%u 0 obj\n", _tmp293_);
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp297_ = _tmp296_;
+				_tmp295_ = _tmp294_;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp294_, _tmp297_);
+				pdf_writer_write_string (_tmp292_, _tmp295_);
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp297_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp298_ = writer;
+				_g_free0 (_tmp295_);
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp299_ = color_space;
+				_tmp296_ = writer;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp300_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp299_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp301_ = _tmp300_;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp298_, _tmp301_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp301_);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp302_ = writer;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp303_ = depth;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp304_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp303_);
+				pdf_writer_write_string (_tmp296_, "<<\n");
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp305_ = _tmp304_;
+				_tmp297_ = writer;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp302_, _tmp305_);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp305_);
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp306_ = writer;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp307_ = data;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp307__length1 = data_length1;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp308_ = g_strdup_printf ("/Length %d\n", _tmp307__length1);
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp309_ = _tmp308_;
+				pdf_writer_write_string (_tmp297_, "/Type /XObject\n");
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp306_, _tmp309_);
+				_tmp298_ = writer;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp309_);
+				pdf_writer_write_string (_tmp298_, "/Subtype /Image\n");
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp299_ = writer;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp300_ = width;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp301_ = g_strdup_printf ("/Width %d\n", _tmp300_);
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp302_ = _tmp301_;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp310_ = filter;
+				pdf_writer_write_string (_tmp299_, _tmp302_);
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp310_ != NULL) {
-#line 3530 "book.c"
-					PDFWriter* _tmp311_;
-					const gchar* _tmp312_;
-					gchar* _tmp313_ = NULL;
-					gchar* _tmp314_;
+				_g_free0 (_tmp302_);
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp311_ = writer;
+				_tmp303_ = writer;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp312_ = filter;
+				_tmp304_ = height;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp313_ = g_strdup_printf ("/Filter /%s\n", _tmp312_);
+				_tmp305_ = g_strdup_printf ("/Height %d\n", _tmp304_);
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp314_ = _tmp313_;
+				_tmp306_ = _tmp305_;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					pdf_writer_write_string (_tmp311_, _tmp314_);
+				pdf_writer_write_string (_tmp303_, _tmp306_);
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (_tmp314_);
-#line 3547 "book.c"
-				}
+				_g_free0 (_tmp306_);
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp315_ = writer;
+				_tmp307_ = writer;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp308_ = color_space;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp309_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp308_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp310_ = _tmp309_;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp307_, _tmp310_);
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp315_, ">>\n");
+				_g_free0 (_tmp310_);
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp316_ = writer;
+				_tmp311_ = writer;
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp316_, "stream\n");
+				_tmp312_ = depth;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp313_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp312_);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp314_ = _tmp313_;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp311_, _tmp314_);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp314_);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp315_ = writer;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp317_ = writer;
+				_tmp316_ = data;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp318_ = data;
+				_tmp316__length1 = data_length1;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp318__length1 = data_length1;
+				_tmp317_ = g_strdup_printf ("/Length %d\n", _tmp316__length1);
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write (_tmp317_, _tmp318_, _tmp318__length1);
+				_tmp318_ = _tmp317_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp315_, _tmp318_);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp318_);
 #line 445 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp319_ = writer;
+				_tmp319_ = filter;
 #line 445 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp319_, "\n");
+				if (_tmp319_ != NULL) {
+#line 3539 "book.c"
+					PDFWriter* _tmp320_ = NULL;
+					const gchar* _tmp321_ = NULL;
+					gchar* _tmp322_ = NULL;
+					gchar* _tmp323_ = NULL;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp320_ = writer;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp321_ = filter;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp322_ = g_strdup_printf ("/Filter /%s\n", _tmp321_);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp323_ = _tmp322_;
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp320_ = writer;
+					pdf_writer_write_string (_tmp320_, _tmp323_);
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp320_, "endstream\n");
+					_g_free0 (_tmp323_);
+#line 3556 "book.c"
+				}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp321_ = writer;
+				_tmp324_ = writer;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp321_, "endobj\n");
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp322_ = page_width;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp323_ = width_buffer;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp323__length1 = width_buffer_length1;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp324_ = g_ascii_formatd (_tmp323_, _tmp323__length1, "%f", _tmp322_);
+				pdf_writer_write_string (_tmp324_, ">>\n");
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp325_ = writer;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp325_, "stream\n");
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp326_ = writer;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp327_ = data;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp327__length1 = data_length1;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write (_tmp326_, _tmp327_, _tmp327__length1);
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp325_ = page_height;
+				_tmp328_ = writer;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp326_ = height_buffer;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp326__length1 = height_buffer_length1;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp327_ = g_ascii_formatd (_tmp326_, _tmp326__length1, "%f", _tmp325_);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp328_ = i;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp329_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp324_, _tmp327_, _tmp328_);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				command = _tmp329_;
+				pdf_writer_write_string (_tmp328_, "\n");
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp330_ = writer;
+				_tmp329_ = writer;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp330_, "\n");
+				pdf_writer_write_string (_tmp329_, "endstream\n");
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp331_ = writer;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp332_ = pdf_writer_start_object (_tmp331_);
+				_tmp330_ = writer;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp332_;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp333_ = writer;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp334_ = number;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp335_ = g_strdup_printf ("%u 0 obj\n", _tmp334_);
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp336_ = _tmp335_;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp333_, _tmp336_);
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp336_);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp337_ = writer;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp337_, "<<\n");
+				pdf_writer_write_string (_tmp330_, "endobj\n");
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp331_ = page_width;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp332_ = width_buffer;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp332__length1 = width_buffer_length1;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp338_ = writer;
+				_tmp333_ = g_ascii_formatd (_tmp332_, _tmp332__length1, "%f", _tmp331_);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp339_ = command;
+				_tmp334_ = page_height;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp340_ = strlen (_tmp339_);
+				_tmp335_ = height_buffer;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp341_ = _tmp340_;
+				_tmp335__length1 = height_buffer_length1;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp342_ = g_strdup_printf ("/Length %d\n", _tmp341_ + 1);
+				_tmp336_ = g_ascii_formatd (_tmp335_, _tmp335__length1, "%f", _tmp334_);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp343_ = _tmp342_;
+				_tmp337_ = i;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp338_, _tmp343_);
+				_tmp338_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp333_, _tmp336_, _tmp337_);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp343_);
+				command = _tmp338_;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp344_ = writer;
+				_tmp339_ = writer;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp344_, ">>\n");
+				pdf_writer_write_string (_tmp339_, "\n");
 #line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp345_ = writer;
+				_tmp340_ = writer;
 #line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp345_, "stream\n");
+				_tmp341_ = pdf_writer_start_object (_tmp340_);
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				number = _tmp341_;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp346_ = writer;
+				_tmp342_ = writer;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp343_ = number;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp347_ = command;
+				_tmp344_ = g_strdup_printf ("%u 0 obj\n", _tmp343_);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp346_, _tmp347_);
+				_tmp345_ = _tmp344_;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp342_, _tmp345_);
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp345_);
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp348_ = writer;
+				_tmp346_ = writer;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp348_, "\n");
+				pdf_writer_write_string (_tmp346_, "<<\n");
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp347_ = writer;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp348_ = command;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp349_ = strlen (_tmp348_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp350_ = _tmp349_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp351_ = g_strdup_printf ("/Length %d\n", _tmp350_ + 1);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp349_ = writer;
+				_tmp352_ = _tmp351_;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp349_, "endstream\n");
+				pdf_writer_write_string (_tmp347_, _tmp352_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp352_);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp350_ = writer;
+				_tmp353_ = writer;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp350_, "endobj\n");
+				pdf_writer_write_string (_tmp353_, ">>\n");
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp354_ = writer;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp354_, "stream\n");
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp351_ = i;
+				_tmp355_ = writer;
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp351_);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp356_ = command;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp355_, _tmp356_);
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp357_ = writer;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp357_, "\n");
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp358_ = writer;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp358_, "endstream\n");
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp359_ = writer;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp359_, "endobj\n");
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp360_ = i;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp360_);
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (command);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data = (g_free (compressed_data), NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				data = (g_free (data), NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer = (g_free (height_buffer), NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer = (g_free (width_buffer), NULL);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (filter);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (color_space);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 3689 "book.c"
+#line 3698 "book.c"
 			}
 		}
 	}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp352_ = writer;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp352_, "\n");
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp353_ = writer;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp354_ = pdf_writer_start_object (_tmp353_);
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	info_number = _tmp354_;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp355_ = writer;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp356_ = info_number;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp357_ = g_strdup_printf ("%u 0 obj\n", _tmp356_);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp358_ = _tmp357_;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp355_, _tmp358_);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp358_);
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp359_ = writer;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp359_, "<<\n");
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp360_ = writer;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp361_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp362_ = _tmp361_;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp360_, _tmp362_);
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp362_);
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp363_ = writer;
+	_tmp361_ = writer;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp363_, ">>\n");
+	pdf_writer_write_string (_tmp361_, "\n");
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp364_ = writer;
+	_tmp362_ = writer;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp364_, "endobj\n");
+	_tmp363_ = pdf_writer_start_object (_tmp362_);
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	info_number = _tmp363_;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp364_ = writer;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp365_ = info_number;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp366_ = g_strdup_printf ("%u 0 obj\n", _tmp365_);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp367_ = _tmp366_;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp364_, _tmp367_);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp367_);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp368_ = writer;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp368_, "<<\n");
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp365_ = writer;
+	_tmp369_ = writer;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp370_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp371_ = _tmp370_;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp366_ = _tmp365_->offset;
+	pdf_writer_write_string (_tmp369_, _tmp371_);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	xref_offset = _tmp366_;
+	_g_free0 (_tmp371_);
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp367_ = writer;
+	_tmp372_ = writer;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp367_, "xref\n");
+	pdf_writer_write_string (_tmp372_, ">>\n");
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp368_ = writer;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp369_ = writer;
+	_tmp373_ = writer;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp370_ = _tmp369_->object_offsets;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp371_ = g_list_length (_tmp370_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp372_ = g_strdup_printf ("1 %zu\n", (gsize) _tmp371_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp373_ = _tmp372_;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp368_, _tmp373_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp373_);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp373_, "endobj\n");
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp374_ = writer;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp375_ = _tmp374_->object_offsets;
-#line 3767 "book.c"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp375_ = _tmp374_->offset;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	xref_offset = _tmp375_;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp376_ = writer;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp376_, "xref\n");
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp377_ = writer;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp378_ = writer;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp379_ = _tmp378_->object_offsets;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp380_ = g_list_length (_tmp379_);
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp381_ = g_strdup_printf ("1 %zu\n", (gsize) _tmp380_);
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp382_ = _tmp381_;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp377_, _tmp382_);
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp382_);
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp383_ = writer;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp384_ = _tmp383_->object_offsets;
+#line 3776 "book.c"
 	{
 		GList* offset_collection = NULL;
 		GList* offset_it = NULL;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		offset_collection = _tmp375_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		offset_collection = _tmp384_;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (offset_it = offset_collection; offset_it != NULL; offset_it = offset_it->next) {
-#line 3775 "book.c"
+#line 3784 "book.c"
 			guint offset = 0U;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			offset = (guint) ((guintptr) offset_it->data);
-#line 3779 "book.c"
+#line 3788 "book.c"
 			{
-				PDFWriter* _tmp376_;
-				guint _tmp377_;
-				gchar* _tmp378_ = NULL;
-				gchar* _tmp379_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp376_ = writer;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp377_ = offset;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp378_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp377_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp379_ = _tmp378_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp376_, _tmp379_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp379_);
-#line 3797 "book.c"
-			}
-		}
-	}
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp380_ = writer;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp380_, "trailer\n");
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp381_ = writer;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp381_, "<<\n");
+				PDFWriter* _tmp385_ = NULL;
+				guint _tmp386_ = 0U;
+				gchar* _tmp387_ = NULL;
+				gchar* _tmp388_ = NULL;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp382_ = writer;
+				_tmp385_ = writer;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp383_ = writer;
+				_tmp386_ = offset;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp384_ = _tmp383_->object_offsets;
+				_tmp387_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp386_);
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp385_ = g_list_length (_tmp384_);
+				_tmp388_ = _tmp387_;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp386_ = g_strdup_printf ("/Size %zu\n", (gsize) _tmp385_);
+				pdf_writer_write_string (_tmp385_, _tmp388_);
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp387_ = _tmp386_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp382_, _tmp387_);
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp387_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp388_ = writer;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp389_ = info_number;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp390_ = g_strdup_printf ("/Info %u 0 R\n", _tmp389_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp391_ = _tmp390_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp388_, _tmp391_);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp391_);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp392_ = writer;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp393_ = catalog_number;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp394_ = g_strdup_printf ("/Root %u 0 R\n", _tmp393_);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp395_ = _tmp394_;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp392_, _tmp395_);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp395_);
+				_g_free0 (_tmp388_);
+#line 3806 "book.c"
+			}
+		}
+	}
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp389_ = writer;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp389_, "trailer\n");
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp396_ = writer;
+	_tmp390_ = writer;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp396_, ">>\n");
+	pdf_writer_write_string (_tmp390_, "<<\n");
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp397_ = writer;
+	_tmp391_ = writer;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp392_ = writer;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp393_ = _tmp392_->object_offsets;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp394_ = g_list_length (_tmp393_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp397_, "startxref\n");
+	_tmp395_ = g_strdup_printf ("/Size %zu\n", (gsize) _tmp394_);
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp396_ = _tmp395_;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp391_, _tmp396_);
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp396_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp398_ = writer;
+	_tmp397_ = writer;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp399_ = xref_offset;
+	_tmp398_ = info_number;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp400_ = g_strdup_printf ("%zu\n", _tmp399_);
+	_tmp399_ = g_strdup_printf ("/Info %u 0 R\n", _tmp398_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp401_ = _tmp400_;
+	_tmp400_ = _tmp399_;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp398_, _tmp401_);
+	pdf_writer_write_string (_tmp397_, _tmp400_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp401_);
+	_g_free0 (_tmp400_);
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp401_ = writer;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp402_ = catalog_number;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp402_ = writer;
+	_tmp403_ = g_strdup_printf ("/Root %u 0 R\n", _tmp402_);
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp402_, "%%EOF\n");
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp404_ = _tmp403_;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp401_, _tmp404_);
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp404_);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp405_ = writer;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp405_, ">>\n");
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp406_ = writer;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp406_, "startxref\n");
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp407_ = writer;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp408_ = xref_offset;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp409_ = g_strdup_printf ("%zu\n", _tmp408_);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp410_ = _tmp409_;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp407_, _tmp410_);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp410_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp411_ = writer;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp411_, "%%EOF\n");
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_pdf_writer_unref0 (writer);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
-#line 3877 "book.c"
+#line 3886 "book.c"
 }
 
 
 void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label4 = 0;
-#line 3895 "book.c"
+#line 3904 "book.c"
 	GError * _inner_error_ = NULL;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = type;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (((_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jpeg")))) || (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("png"))))) || (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("tiff"))))) {
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 3913 "book.c"
+#line 3922 "book.c"
 			default:
 			{
-				const gchar* _tmp4_;
-				gint _tmp5_;
-				GFile* _tmp6_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				const gchar* _tmp4_ = NULL;
+				gint _tmp5_ = 0;
+				GFile* _tmp6_ = NULL;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = type;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = quality;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = file;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 3933 "book.c"
+#line 3942 "book.c"
 				}
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 3937 "book.c"
+#line 3946 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("ps")))) {
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 3943 "book.c"
+#line 3952 "book.c"
 			default:
 			{
-				GFile* _tmp7_;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				GFile* _tmp7_ = NULL;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = file;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps (self, _tmp7_, &_inner_error_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 3957 "book.c"
+#line 3966 "book.c"
 				}
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 3961 "book.c"
+#line 3970 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("pdf")))) {
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 3967 "book.c"
+#line 3976 "book.c"
 			default:
 			{
-				GFile* _tmp8_;
-				gint _tmp9_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				GFile* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = file;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = quality;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 3984 "book.c"
+#line 3993 "book.c"
 				}
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 3988 "book.c"
+#line 3997 "book.c"
 			}
 		}
 	}
 }
 
 
-void book_set_needs_saving (Book* self, gboolean needs_saving) {
-	gboolean _tmp0_;
-	gboolean needed_saving;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_return_if_fail (self != NULL);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->needs_saving;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	needed_saving = _tmp0_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = needs_saving;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->needs_saving = _tmp1_;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = needed_saving;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = needs_saving;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_tmp2_ != _tmp3_) {
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_signal_emit_by_name (self, "needs-saving-changed");
-#line 4019 "book.c"
-	}
+guint book_get_n_pages (Book* self) {
+	guint result;
+	GList* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_val_if_fail (self != NULL, 0U);
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = self->priv->pages;
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1_ = g_list_length (_tmp0_);
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = _tmp1_;
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	return result;
+#line 4018 "book.c"
 }
 
 
 gboolean book_get_needs_saving (Book* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = self->priv->needs_saving;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = self->priv->needs_saving_;
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp0_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4035 "book.c"
+#line 4033 "book.c"
+}
+
+
+void book_set_needs_saving (Book* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+#line 22 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_if_fail (self != NULL);
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = self->priv->needs_saving_;
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1_ = value;
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	if (_tmp0_ == _tmp1_) {
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		return;
+#line 4051 "book.c"
+	}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp2_ = value;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->needs_saving_ = _tmp2_;
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_emit_by_name (self, "needs-saving-changed");
+#line 4059 "book.c"
 }
 
 
@@ -4050,26 +4074,26 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 		data1 = closure->data;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4054 "book.c"
+#line 4078 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = closure->data;
-#line 4060 "book.c"
+#line 4084 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
-#line 4066 "book.c"
+#line 4090 "book.c"
 }
 
 
 static void value_book_init (GValue* value) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 4073 "book.c"
+#line 4097 "book.c"
 }
 
 
@@ -4078,7 +4102,7 @@ static void value_book_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (value->data[0].v_pointer);
-#line 4082 "book.c"
+#line 4106 "book.c"
 	}
 }
 
@@ -4088,11 +4112,11 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 	if (src_value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = book_ref (src_value->data[0].v_pointer);
-#line 4092 "book.c"
+#line 4116 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4096 "book.c"
+#line 4120 "book.c"
 	}
 }
 
@@ -4100,37 +4124,37 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 static gpointer value_book_peek_pointer (const GValue* value) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4104 "book.c"
+#line 4128 "book.c"
 }
 
 
 static gchar* value_book_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 4111 "book.c"
+#line 4135 "book.c"
 		Book* object;
 		object = collect_values[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4118 "book.c"
+#line 4142 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4122 "book.c"
+#line 4146 "book.c"
 		}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = book_ref (object);
-#line 4126 "book.c"
+#line 4150 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4130 "book.c"
+#line 4154 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4134 "book.c"
+#line 4158 "book.c"
 }
 
 
@@ -4141,25 +4165,25 @@ static gchar* value_book_lcopy_value (const GValue* value, guint n_collect_value
 	if (!object_p) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4145 "book.c"
+#line 4169 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 4151 "book.c"
+#line 4175 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4155 "book.c"
+#line 4179 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = book_ref (value->data[0].v_pointer);
-#line 4159 "book.c"
+#line 4183 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4163 "book.c"
+#line 4187 "book.c"
 }
 
 
@@ -4173,7 +4197,7 @@ GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 4177 "book.c"
+#line 4201 "book.c"
 }
 
 
@@ -4182,7 +4206,7 @@ gpointer value_get_book (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK), NULL);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4186 "book.c"
+#line 4210 "book.c"
 }
 
 
@@ -4202,17 +4226,17 @@ void value_set_book (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_ref (value->data[0].v_pointer);
-#line 4206 "book.c"
+#line 4230 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4210 "book.c"
+#line 4234 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
-#line 4216 "book.c"
+#line 4240 "book.c"
 	}
 }
 
@@ -4231,17 +4255,17 @@ void value_take_book (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 4235 "book.c"
+#line 4259 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4239 "book.c"
+#line 4263 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
-#line 4245 "book.c"
+#line 4269 "book.c"
 	}
 }
 
@@ -4265,7 +4289,7 @@ static void book_class_init (BookClass * klass) {
 	g_signal_new ("needs_saving_changed", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("saving", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-#line 4269 "book.c"
+#line 4293 "book.c"
 }
 
 
@@ -4274,61 +4298,61 @@ static void book_instance_init (Book * self) {
 	self->priv = BOOK_GET_PRIVATE (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 4278 "book.c"
+#line 4302 "book.c"
 }
 
 
 static void book_finalize (Book* obj) {
 	Book * self;
-	GList* _tmp0_;
+	GList* _tmp0_ = NULL;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK, Book);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 4289 "book.c"
+#line 4313 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 4297 "book.c"
-			Page* _tmp1_;
+#line 4321 "book.c"
+			Page* _tmp1_ = NULL;
 			Page* page = NULL;
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
-#line 4304 "book.c"
+#line 4328 "book.c"
 			{
-				Page* _tmp2_;
+				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
-				Page* _tmp4_;
+				Page* _tmp4_ = NULL;
 				guint _tmp5_ = 0U;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = page;
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 4324 "book.c"
+#line 4348 "book.c"
 			}
 		}
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 4332 "book.c"
+#line 4356 "book.c"
 }
 
 
@@ -4353,7 +4377,7 @@ gpointer book_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 4357 "book.c"
+#line 4381 "book.c"
 }
 
 
@@ -4366,70 +4390,70 @@ void book_unref (gpointer instance) {
 		BOOK_GET_CLASS (self)->finalize (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4370 "book.c"
+#line 4394 "book.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4378 "book.c"
+#line 4402 "book.c"
 }
 
 
 PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PDFWriter* self = NULL;
-	GFileOutputStream* _tmp0_;
-	GFileOutputStream* _tmp1_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	GFileOutputStream* _tmp0_ = NULL;
+	GFileOutputStream* _tmp1_ = NULL;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PDFWriter*) g_type_create_instance (object_type);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->stream = _tmp1_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 4400 "book.c"
+#line 4424 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
-#line 4407 "book.c"
+#line 4431 "book.c"
 }
 
 
 void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
-	gsize _tmp4_;
-	guint8* _tmp5_;
-	gint _tmp5__length1;
+	gsize _tmp4_ = 0UL;
+	guint8* _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 4418 "book.c"
+#line 4442 "book.c"
 	{
-		GFileOutputStream* _tmp0_;
-		guint8* _tmp1_;
-		gint _tmp1__length1;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		GFileOutputStream* _tmp0_ = NULL;
+		guint8* _tmp1_ = NULL;
+		gint _tmp1__length1 = 0;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->priv->stream;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-#line 4433 "book.c"
+#line 4457 "book.c"
 			goto __catch1_g_error;
 		}
 	}
@@ -4437,366 +4461,366 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	__catch1_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_;
-		const gchar* _tmp3_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:546: Error writing PDF: %s", _tmp3_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_warning ("book.vala:538: Error writing PDF: %s", _tmp3_);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 4455 "book.c"
+#line 4479 "book.c"
 	}
 	__finally1:
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4466 "book.c"
+#line 4490 "book.c"
 	}
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = data;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5__length1 = data_length1;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
-#line 4476 "book.c"
+#line 4500 "book.c"
 }
 
 
 static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gchar* result = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
 	gchar* _tmp2_ = NULL;
-	gchar* _result_;
-	gint _result__length1;
-	gint __result__size_;
-	gint _tmp3_;
-	gchar* _tmp4_;
-	gint _tmp4__length1;
-	gint _tmp5_;
-	gint _tmp6_;
-	gchar* _tmp7_;
-	gint _tmp7__length1;
-#line 1267 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	gint _result__length1 = 0;
+	gint __result__size_ = 0;
+	gint _tmp3_ = 0;
+	gchar* _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	gchar* _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+#line 1266 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 4531 "book.c"
+#line 4555 "book.c"
 	}
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 4537 "book.c"
+#line 4561 "book.c"
 }
 
 
 void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gchar* _tmp2_ = NULL;
-	guint8* _tmp3_;
-	gint _tmp3__length1;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	guint8* _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (text != NULL);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = text;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = string_to_utf8 (_tmp0_, &_tmp1_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (guint8*) _tmp2_;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = (_tmp1_ * sizeof (gchar)) / sizeof (guint8);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 4563 "book.c"
+#line 4587 "book.c"
 }
 
 
 guint pdf_writer_start_object (PDFWriter* self) {
 	guint result = 0U;
-	gsize _tmp0_;
-	GList* _tmp1_;
+	gsize _tmp0_ = 0UL;
+	GList* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->offset;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->object_offsets = g_list_append (self->object_offsets, (gpointer) ((guintptr) ((guint) _tmp0_)));
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = self->object_offsets;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_length (_tmp1_);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp2_;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4586 "book.c"
+#line 4610 "book.c"
 }
 
 
 static void value_pdf_writer_init (GValue* value) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 4593 "book.c"
+#line 4617 "book.c"
 }
 
 
 static void value_pdf_writer_free_value (GValue* value) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
-#line 4602 "book.c"
+#line 4626 "book.c"
 	}
 }
 
 
 static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = pdf_writer_ref (src_value->data[0].v_pointer);
-#line 4612 "book.c"
+#line 4636 "book.c"
 	} else {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4616 "book.c"
+#line 4640 "book.c"
 	}
 }
 
 
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4624 "book.c"
+#line 4648 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 4631 "book.c"
+#line 4655 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4638 "book.c"
+#line 4662 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4642 "book.c"
+#line 4666 "book.c"
 		}
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
-#line 4646 "book.c"
+#line 4670 "book.c"
 	} else {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4650 "book.c"
+#line 4674 "book.c"
 	}
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4654 "book.c"
+#line 4678 "book.c"
 }
 
 
 static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PDFWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4665 "book.c"
+#line 4689 "book.c"
 	}
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 4671 "book.c"
+#line 4695 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4675 "book.c"
+#line 4699 "book.c"
 	} else {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
-#line 4679 "book.c"
+#line 4703 "book.c"
 	}
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4683 "book.c"
+#line 4707 "book.c"
 }
 
 
 GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPDFWriter* spec;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PDF_WRITER), NULL);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 4697 "book.c"
+#line 4721 "book.c"
 }
 
 
 gpointer value_get_pdf_writer (const GValue* value) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER), NULL);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4706 "book.c"
+#line 4730 "book.c"
 }
 
 
 void value_set_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
-#line 4726 "book.c"
+#line 4750 "book.c"
 	} else {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4730 "book.c"
+#line 4754 "book.c"
 	}
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 4736 "book.c"
+#line 4760 "book.c"
 	}
 }
 
 
 void value_take_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 4755 "book.c"
+#line 4779 "book.c"
 	} else {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4759 "book.c"
+#line 4783 "book.c"
 	}
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 4765 "book.c"
+#line 4789 "book.c"
 	}
 }
 
 
 static void pdf_writer_class_init (PDFWriterClass * klass) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	PDF_WRITER_CLASS (klass)->finalize = pdf_writer_finalize;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
-#line 4777 "book.c"
+#line 4801 "book.c"
 }
 
 
 static void pdf_writer_instance_init (PDFWriter * self) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = PDF_WRITER_GET_PRIVATE (self);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = (gsize) 0;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 4788 "book.c"
+#line 4812 "book.c"
 }
 
 
 static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_list_free0 (self->object_offsets);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 4800 "book.c"
+#line 4824 "book.c"
 }
 
 
@@ -4817,24 +4841,24 @@ GType pdf_writer_get_type (void) {
 gpointer pdf_writer_ref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 4825 "book.c"
+#line 4849 "book.c"
 }
 
 
 void pdf_writer_unref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4838 "book.c"
+#line 4862 "book.c"
 	}
 }
 
@@ -4842,69 +4866,69 @@ void pdf_writer_unref (gpointer instance) {
 static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer self, guchar* data, int data_length1) {
 	cairo_status_t result;
 	result = ps_writer_write_cairo_data (self, data, data_length1);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4848 "book.c"
+#line 4872 "book.c"
 }
 
 
 PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PsWriter* self = NULL;
-	GFileOutputStream* _tmp0_;
-	GFileOutputStream* _tmp1_;
-	cairo_surface_t* _tmp2_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	GFileOutputStream* _tmp0_ = NULL;
+	GFileOutputStream* _tmp1_ = NULL;
+	cairo_surface_t* _tmp2_ = NULL;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PsWriter*) g_type_create_instance (object_type);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->stream = _tmp1_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = cairo_ps_surface_create_for_stream (_ps_writer_write_cairo_data_cairo_write_func_t, self, (gdouble) 0, (gdouble) 0);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->surface = _tmp2_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 4877 "book.c"
+#line 4901 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
-#line 4884 "book.c"
+#line 4908 "book.c"
 }
 
 
 static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data, int data_length1) {
 	cairo_status_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4893 "book.c"
+#line 4917 "book.c"
 	{
-		GFileOutputStream* _tmp0_;
-		guint8* _tmp1_;
-		gint _tmp1__length1;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		GFileOutputStream* _tmp0_ = NULL;
+		guint8* _tmp1_ = NULL;
+		gint _tmp1__length1 = 0;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->stream;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-#line 4908 "book.c"
+#line 4932 "book.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -4912,250 +4936,250 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 	__catch2_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_;
-		const gchar* _tmp3_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:582: Error writing data: %s", _tmp3_);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_warning ("book.vala:574: Error writing data: %s", _tmp3_);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = CAIRO_STATUS_WRITE_ERROR;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 4934 "book.c"
+#line 4958 "book.c"
 	}
 	__finally2:
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
-#line 4945 "book.c"
+#line 4969 "book.c"
 	}
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4951 "book.c"
+#line 4975 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 4958 "book.c"
+#line 4982 "book.c"
 }
 
 
 static void value_ps_writer_free_value (GValue* value) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
-#line 4967 "book.c"
+#line 4991 "book.c"
 	}
 }
 
 
 static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = ps_writer_ref (src_value->data[0].v_pointer);
-#line 4977 "book.c"
+#line 5001 "book.c"
 	} else {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4981 "book.c"
+#line 5005 "book.c"
 	}
 }
 
 
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4989 "book.c"
+#line 5013 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 4996 "book.c"
+#line 5020 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5003 "book.c"
+#line 5027 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5007 "book.c"
+#line 5031 "book.c"
 		}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
-#line 5011 "book.c"
+#line 5035 "book.c"
 	} else {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5015 "book.c"
+#line 5039 "book.c"
 	}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5019 "book.c"
+#line 5043 "book.c"
 }
 
 
 static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PsWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5030 "book.c"
+#line 5054 "book.c"
 	}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5036 "book.c"
+#line 5060 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5040 "book.c"
+#line 5064 "book.c"
 	} else {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
-#line 5044 "book.c"
+#line 5068 "book.c"
 	}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5048 "book.c"
+#line 5072 "book.c"
 }
 
 
 GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPsWriter* spec;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PS_WRITER), NULL);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5062 "book.c"
+#line 5086 "book.c"
 }
 
 
 gpointer value_get_ps_writer (const GValue* value) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER), NULL);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5071 "book.c"
+#line 5095 "book.c"
 }
 
 
 void value_set_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
-#line 5091 "book.c"
+#line 5115 "book.c"
 	} else {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5095 "book.c"
+#line 5119 "book.c"
 	}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5101 "book.c"
+#line 5125 "book.c"
 	}
 }
 
 
 void value_take_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5120 "book.c"
+#line 5144 "book.c"
 	} else {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5124 "book.c"
+#line 5148 "book.c"
 	}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5130 "book.c"
+#line 5154 "book.c"
 	}
 }
 
 
 static void ps_writer_class_init (PsWriterClass * klass) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	PS_WRITER_CLASS (klass)->finalize = ps_writer_finalize;
-#line 5140 "book.c"
+#line 5164 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5147 "book.c"
+#line 5171 "book.c"
 }
 
 
 static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 5159 "book.c"
+#line 5183 "book.c"
 }
 
 
@@ -5176,24 +5200,24 @@ GType ps_writer_get_type (void) {
 gpointer ps_writer_ref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5184 "book.c"
+#line 5208 "book.c"
 }
 
 
 void ps_writer_unref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PS_WRITER_GET_CLASS (self)->finalize (self);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5197 "book.c"
+#line 5221 "book.c"
 	}
 }
 
diff --git a/src/book.vala b/src/book.vala
index a4e6cdd..97e49a8 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -13,7 +13,20 @@ public class Book
 {
     private List<Page> pages;
 
-    private bool needs_saving;
+    public uint n_pages { get { return pages.length (); } }
+
+    private bool needs_saving_;
+    public bool needs_saving
+    {
+        get { return needs_saving_; }
+        set
+        {
+            if (needs_saving_ == value)
+                return;
+            needs_saving_ = value;
+            needs_saving_changed ();
+        }
+    }
 
     public signal void page_added (Page page);
     public signal void page_removed (Page page);
@@ -49,20 +62,17 @@ public class Book
 
     private void page_changed_cb (Page page)
     {
-        set_needs_saving (true);
+        needs_saving = true;
     }
 
-    public Page append_page (int width, int height, int dpi, ScanDirection scan_direction)
+    public void append_page (Page page)
     {
-        var page = new Page (width, height, dpi, scan_direction);
         page.pixels_changed.connect (page_changed_cb);
         page.crop_changed.connect (page_changed_cb);
 
         pages.append (page);
         page_added (page);
-        set_needs_saving (true);
-
-        return page;
+        needs_saving = true;
     }
 
     public void move_page (Page page, uint location)
@@ -70,7 +80,7 @@ public class Book
         pages.remove (page);
         pages.insert (page, (int) location);
         reordered ();
-        set_needs_saving (true);
+        needs_saving = true;
     }
 
     public void delete_page (Page page)
@@ -79,12 +89,7 @@ public class Book
         page.crop_changed.disconnect (page_changed_cb);
         page_removed (page);
         pages.remove (page);
-        set_needs_saving (true);
-    }
-
-    public uint get_n_pages ()
-    {
-        return pages.length ();
+        needs_saving = true;
     }
 
     public Page get_page (int page_number)
@@ -101,7 +106,7 @@ public class Book
 
     private File make_indexed_file (string uri, int i)
     {
-        if (get_n_pages () == 1)
+        if (n_pages == 1)
             return File.new_for_uri (uri);
 
         /* Insert index before extension */
@@ -113,7 +118,7 @@ public class Book
             suffix = basename.slice (extension_index, basename.length);
             prefix = uri.slice (0, uri.length - suffix.length);
         }
-        var width = get_n_pages ().to_string().length;
+        var width = n_pages.to_string().length;
         var number_format = "%%0%dd".printf (width);
         var filename = prefix + "-" + number_format.printf (i + 1) + suffix;
         return File.new_for_uri (filename);
@@ -121,7 +126,7 @@ public class Book
 
     private void save_multi_file (string type, int quality, File file) throws Error
     {
-        for (var i = 0; i < get_n_pages (); i++)
+        for (var i = 0; i < n_pages; i++)
         {
             var page = get_page (i);
             page.save (type, quality, make_indexed_file (file.get_uri (), i));
@@ -144,14 +149,14 @@ public class Book
         var writer = new PsWriter (stream);
         var surface = writer.surface;
 
-        for (var i = 0; i < get_n_pages (); i++)
+        for (var i = 0; i < n_pages; i++)
         {
             var page = get_page (i);
             var image = page.get_image (true);
-            var width = image.get_width () * 72.0 / page.get_dpi ();
-            var height = image.get_height () * 72.0 / page.get_dpi ();
+            var width = image.get_width () * 72.0 / page.dpi;
+            var height = image.get_height () * 72.0 / page.dpi;
             surface.set_size (width, height);
-            save_ps_pdf_surface (surface, image, page.get_dpi ());
+            save_ps_pdf_surface (surface, image, page.dpi);
             surface.show_page ();
             saving (i);
         }
@@ -248,22 +253,22 @@ public class Book
         writer.write_string ("<<\n");
         writer.write_string ("/Type /Pages\n");
         writer.write_string ("/Kids [");
-        for (var i = 0; i < get_n_pages (); i++)
+        for (var i = 0; i < n_pages; i++)
             writer.write_string (" %u 0 R".printf (pages_number + 1 + (i*3)));
         writer.write_string (" ]\n");
-        writer.write_string ("/Count %u\n".printf (get_n_pages ()));
+        writer.write_string ("/Count %u\n".printf (n_pages));
         writer.write_string (">>\n");
         writer.write_string ("endobj\n");
 
-        for (var i = 0; i < get_n_pages (); i++)
+        for (var i = 0; i < n_pages; i++)
         {
             var page = get_page (i);
             var image = page.get_image (true);
             var width = image.get_width ();
             var height = image.get_height ();
             unowned uint8[] pixels = image.get_pixels ();
-            var page_width = width * 72.0 / page.get_dpi ();
-            var page_height = height * 72.0 / page.get_dpi ();
+            var page_width = width * 72.0 / page.dpi;
+            var page_height = height * 72.0 / page.dpi;
 
             int depth = 8;
             string color_space = "DeviceRGB";
@@ -271,7 +276,7 @@ public class Book
             char[] width_buffer = new char[double.DTOSTR_BUF_SIZE];
             char[] height_buffer = new char[double.DTOSTR_BUF_SIZE];
             uint8[] data;
-            if (page.is_color ())
+            if (page.is_color)
             {
                 depth = 8;
                 color_space = "DeviceRGB";
@@ -292,7 +297,7 @@ public class Book
                     }
                 }
             }
-            else if (page.get_depth () == 2)
+            else if (page.depth == 2)
             {
                 int shift_count = 6;
                 depth = 2;
@@ -336,7 +341,7 @@ public class Book
                     }
                 }
             }
-            else if (page.get_depth () == 1)
+            else if (page.depth == 1)
             {
                 int mask = 0x80;
 
@@ -397,7 +402,7 @@ public class Book
                 /* Try if JPEG compression is better */
                 if (depth > 1)
                 {
-                    var jpeg_data = compress_jpeg (image, quality, page.get_dpi ());
+                    var jpeg_data = compress_jpeg (image, quality, page.dpi);
                     if (jpeg_data.length < compressed_data.length)
                     {
                         filter = "DCTDecode";
@@ -509,19 +514,6 @@ public class Book
             break;
         }
     }
-
-    public void set_needs_saving (bool needs_saving)
-    {
-        var needed_saving = this.needs_saving;
-        this.needs_saving = needs_saving;
-        if (needed_saving != needs_saving)
-            needs_saving_changed ();
-    }
-
-    public bool get_needs_saving ()
-    {
-        return needs_saving;
-    }
 }
 
 private class PDFWriter
diff --git a/src/page-view.c b/src/page-view.c
index 7e770a7..ebf261d 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.20.1, the Vala compiler
+/* page-view.c generated by valac 0.22.1, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
@@ -85,17 +85,17 @@ typedef enum  {
 } ScanDirection;
 
 struct _PageViewPrivate {
-	Page* page;
+	Page* _page;
 	GdkPixbuf* image;
-	gboolean selected;
+	gboolean selected_;
 	gint border_width;
 	gboolean update_image;
 	ScanDirection scan_direction;
 	gint scan_line;
 	gint width;
 	gint height;
-	gint x_offset;
-	gint y_offset;
+	gint _x_offset;
+	gint _y_offset;
 	CropLocation crop_location;
 	gdouble selected_crop_px;
 	gdouble selected_crop_py;
@@ -103,7 +103,7 @@ struct _PageViewPrivate {
 	gint selected_crop_y;
 	gint selected_crop_w;
 	gint selected_crop_h;
-	GdkCursorType cursor;
+	GdkCursorType _cursor;
 	gint animate_n_segments;
 	gint animate_segment;
 	guint animate_timeout;
@@ -136,6 +136,7 @@ GType scan_direction_get_type (void) G_GNUC_CONST;
 enum  {
 	PAGE_VIEW_DUMMY_PROPERTY
 };
+Page* page_view_get_page (PageView* self);
 static void page_view_page_pixels_changed_cb (PageView* self, Page* p);
 static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self);
 static void page_view_page_size_changed_cb (PageView* self, Page* p);
@@ -147,13 +148,7 @@ static void page_view_scan_direction_changed_cb (PageView* self, Page* p);
 static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self);
 PageView* page_view_new (Page* page);
 PageView* page_view_construct (GType object_type, Page* page);
-Page* page_view_get_page (PageView* self);
-void page_view_set_selected (PageView* self, gboolean selected);
-gboolean page_view_get_selected (PageView* self);
-void page_view_set_x_offset (PageView* self, gint offset);
-void page_view_set_y_offset (PageView* self, gint offset);
-gint page_view_get_x_offset (PageView* self);
-gint page_view_get_y_offset (PageView* self);
+static void page_view_set_page (PageView* self, Page* value);
 static guchar page_view_get_sample (PageView* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint sample);
 static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guchar* pixel, int pixel_length1);
 ScanDirection page_get_scan_direction (Page* self);
@@ -167,7 +162,7 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** output_image, gint output_width, gint output_height, ScanDirection scan_direction, gint old_scan_line, gint scan_line);
 gint page_get_width (Page* self);
 gint page_get_height (Page* self);
-gboolean page_has_data (Page* self);
+gboolean page_get_has_data (Page* self);
 static gint page_view_get_preview_width (PageView* self);
 static gint page_view_get_preview_height (PageView* self);
 static void page_view_update_page_view (PageView* self);
@@ -177,24 +172,34 @@ static gint page_view_page_to_screen_y (PageView* self, gint y);
 static gint page_view_screen_to_page_x (PageView* self, gint x);
 static gint page_view_screen_to_page_y (PageView* self, gint y);
 static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y);
-gboolean page_has_crop (Page* self);
-void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height);
-gchar* page_get_named_crop (Page* self);
+gboolean page_get_has_crop (Page* self);
+gint page_get_crop_x (Page* self);
+gint page_get_crop_y (Page* self);
+gint page_get_crop_width (Page* self);
+gint page_get_crop_height (Page* self);
+const gchar* page_get_crop_name (Page* self);
 void page_view_button_press (PageView* self, gint x, gint y);
 void page_view_motion (PageView* self, gint x, gint y);
+static void page_view_set_cursor (PageView* self, GdkCursorType value);
 void page_move_crop (Page* self, gint x, gint y);
 void page_set_custom_crop (Page* self, gint width, gint height);
 void page_view_button_release (PageView* self, gint x, gint y);
-GdkCursorType page_view_get_cursor (PageView* self);
 static gboolean page_view_animation_cb (PageView* self);
 static void page_view_update_animation (PageView* self);
-gboolean page_is_scanning (Page* self);
+gboolean page_get_is_scanning (Page* self);
 static gboolean _page_view_animation_cb_gsource_func (gpointer self);
 void page_view_render (PageView* self, cairo_t* context);
+gint page_view_get_x_offset (PageView* self);
+gint page_view_get_y_offset (PageView* self);
 void page_view_set_width (PageView* self, gint width);
 void page_view_set_height (PageView* self, gint height);
 gint page_view_get_width (PageView* self);
 gint page_view_get_height (PageView* self);
+gboolean page_view_get_selected (PageView* self);
+void page_view_set_selected (PageView* self, gboolean value);
+void page_view_set_x_offset (PageView* self, gint value);
+void page_view_set_y_offset (PageView* self, gint value);
+GdkCursorType page_view_get_cursor (PageView* self);
 static void page_view_finalize (PageView* obj);
 
 
@@ -211,1920 +216,1769 @@ GType crop_location_get_type (void) {
 
 
 static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_pixels_changed_cb (self, _sender);
-#line 217 "page-view.c"
+#line 222 "page-view.c"
 }
 
 
 static void _page_view_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_size_changed_cb (self, _sender);
-#line 224 "page-view.c"
+#line 229 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_overlay_changed_cb (self, _sender);
-#line 231 "page-view.c"
+#line 236 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_scan_line_changed (Page* _sender, gpointer self) {
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_overlay_changed_cb (self, _sender);
-#line 238 "page-view.c"
+#line 243 "page-view.c"
 }
 
 
 static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_scan_direction_changed_cb (self, _sender);
-#line 245 "page-view.c"
-}
-
-
-static gpointer _page_ref0 (gpointer self) {
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return self ? page_ref (self) : NULL;
-#line 252 "page-view.c"
+#line 250 "page-view.c"
 }
 
 
 PageView* page_view_construct (GType object_type, Page* page) {
 	PageView* self = NULL;
-	Page* _tmp0_;
-	Page* _tmp1_;
-	Page* _tmp2_;
-	Page* _tmp3_;
-	Page* _tmp4_;
-	Page* _tmp5_;
-	Page* _tmp6_;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self = (PageView*) g_type_create_instance (object_type);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = _page_ref0 (_tmp0_);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_page_unref0 (self->priv->page);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->page = _tmp1_;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	page_view_set_page (self, _tmp0_);
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = page;
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_connect (_tmp1_, "pixels-changed", (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page;
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp2_, "pixels-changed", (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_connect (_tmp2_, "size-changed", (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp3_, "size-changed", (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_connect (_tmp3_, "crop-changed", (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp4_, "crop-changed", (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_connect (_tmp4_, "scan-line-changed", (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = page;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp5_, "scan-line-changed", (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = page;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_connect (_tmp6_, "scan-direction-changed", (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_connect (_tmp5_, "scan-direction-changed", (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return self;
-#line 299 "page-view.c"
+#line 292 "page-view.c"
 }
 
 
 PageView* page_view_new (Page* page) {
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return page_view_construct (TYPE_PAGE_VIEW, page);
-#line 306 "page-view.c"
-}
-
-
-Page* page_view_get_page (PageView* self) {
-	Page* result = NULL;
-	Page* _tmp0_;
-	Page* _tmp1_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->page;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = _page_ref0 (_tmp0_);
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp1_;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 324 "page-view.c"
-}
-
-
-void page_view_set_selected (PageView* self, gboolean selected) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_;
-	gboolean _tmp4_;
-	gboolean _tmp9_;
-	gboolean _tmp10_;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->selected;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp2_) {
-#line 341 "page-view.c"
-		gboolean _tmp3_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp3_ = selected;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp1_ = _tmp3_;
-#line 347 "page-view.c"
-	} else {
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp1_ = FALSE;
-#line 351 "page-view.c"
-	}
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = _tmp1_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp4_) {
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = TRUE;
-#line 359 "page-view.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_;
-		gboolean _tmp8_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp6_ = self->priv->selected;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (!_tmp6_) {
-#line 368 "page-view.c"
-			gboolean _tmp7_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp7_ = selected;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp5_ = !_tmp7_;
-#line 374 "page-view.c"
-		} else {
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp5_ = FALSE;
-#line 378 "page-view.c"
-		}
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = _tmp5_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = _tmp8_;
-#line 384 "page-view.c"
-	}
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = _tmp0_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp9_) {
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 392 "page-view.c"
-	}
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = selected;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->selected = _tmp10_;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 400 "page-view.c"
+#line 299 "page-view.c"
 }
 
 
-gboolean page_view_get_selected (PageView* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->selected;
+static guchar page_view_get_sample (PageView* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint sample) {
+	guchar result = '\0';
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, '\0');
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
+	result = (guchar) 0xFF;
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 415 "page-view.c"
+#line 311 "page-view.c"
 }
 
 
-void page_view_set_x_offset (PageView* self, gint offset) {
-	gint _tmp0_;
+static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guchar* pixel, int pixel_length1) {
+	Page* _tmp0_ = NULL;
+	ScanDirection _tmp1_ = 0;
+	ScanDirection _tmp2_ = 0;
+	gint depth = 0;
+	Page* _tmp23_ = NULL;
+	gint _tmp24_ = 0;
+	gint _tmp25_ = 0;
+	gint n_channels = 0;
+	Page* _tmp26_ = NULL;
+	gint _tmp27_ = 0;
+	gint _tmp28_ = 0;
+	guchar* pixels = NULL;
+	Page* _tmp29_ = NULL;
+	gint _tmp30_ = 0;
+	guchar* _tmp31_ = NULL;
+	gint pixels_length1 = 0;
+	gint _pixels_size_ = 0;
+	gint offset = 0;
+	Page* _tmp32_ = NULL;
+	gint _tmp33_ = 0;
+	gint _tmp34_ = 0;
+	gint _tmp35_ = 0;
+	gboolean _tmp36_ = FALSE;
+	gint _tmp37_ = 0;
+	gboolean _tmp39_ = FALSE;
+	guchar* _tmp110_ = NULL;
+	gint _tmp110__length1 = 0;
+	guchar* _tmp111_ = NULL;
+	gint _tmp111__length1 = 0;
+	gint _tmp112_ = 0;
+	gint _tmp113_ = 0;
+	gint _tmp114_ = 0;
+	gint _tmp115_ = 0;
+	gint _tmp116_ = 0;
+	guchar _tmp117_ = '\0';
+	guchar _tmp118_ = '\0';
+	guchar* _tmp119_ = NULL;
+	gint _tmp119__length1 = 0;
+	guchar* _tmp120_ = NULL;
+	gint _tmp120__length1 = 0;
+	gint _tmp121_ = 0;
+	gint _tmp122_ = 0;
+	gint _tmp123_ = 0;
+	gint _tmp124_ = 0;
+	gint _tmp125_ = 0;
+	guchar _tmp126_ = '\0';
+	guchar _tmp127_ = '\0';
+	guchar* _tmp128_ = NULL;
+	gint _tmp128__length1 = 0;
+	guchar* _tmp129_ = NULL;
+	gint _tmp129__length1 = 0;
+	gint _tmp130_ = 0;
+	gint _tmp131_ = 0;
+	gint _tmp132_ = 0;
+	gint _tmp133_ = 0;
+	gint _tmp134_ = 0;
+	guchar _tmp135_ = '\0';
+	guchar _tmp136_ = '\0';
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (page != NULL);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = offset;
+	_tmp0_ = page;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->x_offset = _tmp0_;
-#line 427 "page-view.c"
-}
-
-
-void page_view_set_y_offset (PageView* self, gint offset) {
-	gint _tmp0_;
+	_tmp1_ = page_get_scan_direction (_tmp0_);
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = _tmp1_;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	switch (_tmp2_) {
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 388 "page-view.c"
+		{
 #line 115 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
+			break;
+#line 392 "page-view.c"
+		}
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 396 "page-view.c"
+		{
+			Page* _tmp3_ = NULL;
+			gint _tmp4_ = 0;
+			gint _tmp5_ = 0;
+			gint _tmp6_ = 0;
+			Page* _tmp7_ = NULL;
+			gint _tmp8_ = 0;
+			gint _tmp9_ = 0;
+			gint _tmp10_ = 0;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = offset;
+			_tmp3_ = page;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->y_offset = _tmp0_;
-#line 439 "page-view.c"
-}
-
-
-gint page_view_get_x_offset (PageView* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
+			_tmp4_ = page_get_scan_width (_tmp3_);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp5_ = _tmp4_;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp6_ = x;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			x = (_tmp5_ - _tmp6_) - 1;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp7_ = page;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp8_ = page_get_scan_height (_tmp7_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp9_ = _tmp8_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp10_ = y;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			y = (_tmp9_ - _tmp10_) - 1;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			break;
+#line 428 "page-view.c"
+		}
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 432 "page-view.c"
+		{
+			gint t = 0;
+			gint _tmp11_ = 0;
+			Page* _tmp12_ = NULL;
+			gint _tmp13_ = 0;
+			gint _tmp14_ = 0;
+			gint _tmp15_ = 0;
+			gint _tmp16_ = 0;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp11_ = x;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			t = _tmp11_;
 #line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->x_offset;
+			_tmp12_ = page;
 #line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
+			_tmp13_ = page_get_scan_width (_tmp12_);
 #line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 454 "page-view.c"
-}
-
-
-gint page_view_get_y_offset (PageView* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->y_offset;
+			_tmp14_ = _tmp13_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp15_ = y;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			x = (_tmp14_ - _tmp15_) - 1;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp16_ = t;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			y = _tmp16_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			break;
+#line 461 "page-view.c"
+		}
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 465 "page-view.c"
+		{
+			gint t = 0;
+			gint _tmp17_ = 0;
+			gint _tmp18_ = 0;
+			Page* _tmp19_ = NULL;
+			gint _tmp20_ = 0;
+			gint _tmp21_ = 0;
+			gint _tmp22_ = 0;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp17_ = x;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			t = _tmp17_;
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
+			_tmp18_ = y;
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 469 "page-view.c"
-}
-
-
-static guchar page_view_get_sample (PageView* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint sample) {
-	guchar result = '\0';
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, '\0');
+			x = _tmp18_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp19_ = page;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp20_ = page_get_scan_height (_tmp19_);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp21_ = _tmp20_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp22_ = t;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			y = (_tmp21_ - _tmp22_) - 1;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			break;
+#line 494 "page-view.c"
+		}
+		default:
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		break;
+#line 499 "page-view.c"
+	}
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp23_ = page;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp24_ = page_get_depth (_tmp23_);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp25_ = _tmp24_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	depth = _tmp25_;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (guchar) 0xFF;
+	_tmp26_ = page;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 481 "page-view.c"
-}
-
-
-static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guchar* pixel, int pixel_length1) {
-	Page* _tmp0_;
-	ScanDirection _tmp1_ = 0;
-	Page* _tmp18_;
-	gint _tmp19_ = 0;
-	gint depth;
-	Page* _tmp20_;
-	gint _tmp21_ = 0;
-	gint n_channels;
-	Page* _tmp22_;
-	gint _tmp23_ = 0;
-	guchar* _tmp24_ = NULL;
-	guchar* pixels;
-	gint pixels_length1;
-	gint _pixels_size_;
-	Page* _tmp25_;
-	gint _tmp26_ = 0;
-	gint _tmp27_;
-	gint offset;
-	gboolean _tmp28_ = FALSE;
-	gint _tmp29_;
-	gboolean _tmp31_;
-	guchar* _tmp102_;
-	gint _tmp102__length1;
-	guchar* _tmp103_;
-	gint _tmp103__length1;
-	gint _tmp104_;
-	gint _tmp105_;
-	gint _tmp106_;
-	gint _tmp107_;
-	gint _tmp108_;
-	guchar _tmp109_ = '\0';
-	guchar _tmp110_;
-	guchar* _tmp111_;
-	gint _tmp111__length1;
-	guchar* _tmp112_;
-	gint _tmp112__length1;
-	gint _tmp113_;
-	gint _tmp114_;
-	gint _tmp115_;
-	gint _tmp116_;
-	gint _tmp117_;
-	guchar _tmp118_ = '\0';
-	guchar _tmp119_;
-	guchar* _tmp120_;
-	gint _tmp120__length1;
-	guchar* _tmp121_;
-	gint _tmp121__length1;
-	gint _tmp122_;
-	gint _tmp123_;
-	gint _tmp124_;
-	gint _tmp125_;
-	gint _tmp126_;
-	guchar _tmp127_ = '\0';
-	guchar _tmp128_;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (page != NULL);
+	_tmp27_ = page_get_n_channels (_tmp26_);
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp28_ = _tmp27_;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	n_channels = _tmp28_;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp29_ = page;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp31_ = page_get_pixels (_tmp29_, &_tmp30_);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	pixels = _tmp31_;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	pixels_length1 = _tmp30_;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_pixels_size_ = pixels_length1;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp32_ = page;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp33_ = page_get_rowstride (_tmp32_);
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp34_ = _tmp33_;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp35_ = y;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	offset = _tmp34_ * _tmp35_;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = page;
+	_tmp37_ = depth;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_get_scan_direction (_tmp0_);
+	if (_tmp37_ == 8) {
+#line 541 "page-view.c"
+		gint _tmp38_ = 0;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	switch (_tmp1_) {
+		_tmp38_ = n_channels;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 552 "page-view.c"
-		{
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 556 "page-view.c"
-		}
+		_tmp36_ = _tmp38_ == 3;
+#line 547 "page-view.c"
+	} else {
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 560 "page-view.c"
-		{
-			Page* _tmp2_;
-			gint _tmp3_ = 0;
-			gint _tmp4_;
-			Page* _tmp5_;
-			gint _tmp6_ = 0;
-			gint _tmp7_;
+		_tmp36_ = FALSE;
+#line 551 "page-view.c"
+	}
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp39_ = _tmp36_;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp39_) {
+#line 557 "page-view.c"
+		gint o = 0;
+		gint _tmp40_ = 0;
+		gint _tmp41_ = 0;
+		gint _tmp42_ = 0;
+		guchar* _tmp43_ = NULL;
+		gint _tmp43__length1 = 0;
+		guchar* _tmp44_ = NULL;
+		gint _tmp44__length1 = 0;
+		gint _tmp45_ = 0;
+		guchar _tmp46_ = '\0';
+		guchar _tmp47_ = '\0';
+		guchar* _tmp48_ = NULL;
+		gint _tmp48__length1 = 0;
+		guchar* _tmp49_ = NULL;
+		gint _tmp49__length1 = 0;
+		gint _tmp50_ = 0;
+		guchar _tmp51_ = '\0';
+		guchar _tmp52_ = '\0';
+		guchar* _tmp53_ = NULL;
+		gint _tmp53__length1 = 0;
+		guchar* _tmp54_ = NULL;
+		gint _tmp54__length1 = 0;
+		gint _tmp55_ = 0;
+		guchar _tmp56_ = '\0';
+		guchar _tmp57_ = '\0';
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp40_ = offset;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp41_ = x;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp42_ = n_channels;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		o = _tmp40_ + (_tmp41_ * _tmp42_);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp43_ = pixel;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp43__length1 = pixel_length1;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp44_ = pixels;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp44__length1 = pixels_length1;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp45_ = o;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp46_ = _tmp44_[_tmp45_];
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp43_[0] = _tmp46_;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp47_ = _tmp43_[0];
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp48_ = pixel;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp48__length1 = pixel_length1;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp49_ = pixels;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp49__length1 = pixels_length1;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp50_ = o;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp51_ = _tmp49_[_tmp50_ + 1];
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp48_[1] = _tmp51_;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp52_ = _tmp48_[1];
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp2_ = page;
+		_tmp53_ = pixel;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp3_ = page_get_scan_width (_tmp2_);
+		_tmp53__length1 = pixel_length1;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp4_ = x;
+		_tmp54_ = pixels;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = (_tmp3_ - _tmp4_) - 1;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp5_ = page;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp6_ = page_get_scan_height (_tmp5_);
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp7_ = y;
+		_tmp54__length1 = pixels_length1;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp55_ = o;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp56_ = _tmp54_[_tmp55_ + 2];
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp53_[2] = _tmp56_;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp57_ = _tmp53_[2];
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			y = (_tmp6_ - _tmp7_) - 1;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 586 "page-view.c"
+		return;
+#line 641 "page-view.c"
+	} else {
+		gboolean _tmp58_ = FALSE;
+		gint _tmp59_ = 0;
+		gboolean _tmp61_ = FALSE;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp59_ = depth;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp59_ == 8) {
+#line 650 "page-view.c"
+			gint _tmp60_ = 0;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp60_ = n_channels;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp58_ = _tmp60_ == 1;
+#line 656 "page-view.c"
+		} else {
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp58_ = FALSE;
+#line 660 "page-view.c"
 		}
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 590 "page-view.c"
-		{
-			gint _tmp8_;
-			gint t;
-			Page* _tmp9_;
-			gint _tmp10_ = 0;
-			gint _tmp11_;
-			gint _tmp12_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp8_ = x;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			t = _tmp8_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp61_ = _tmp58_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp61_) {
+#line 666 "page-view.c"
+			guchar* _tmp62_ = NULL;
+			gint _tmp62__length1 = 0;
+			guchar* _tmp63_ = NULL;
+			gint _tmp63__length1 = 0;
+			guchar* _tmp64_ = NULL;
+			gint _tmp64__length1 = 0;
+			guchar* _tmp65_ = NULL;
+			gint _tmp65__length1 = 0;
+			gint _tmp66_ = 0;
+			gint _tmp67_ = 0;
+			guchar _tmp68_ = '\0';
+			guchar _tmp69_ = '\0';
+			guchar _tmp70_ = '\0';
+			guchar _tmp71_ = '\0';
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp9_ = page;
+			_tmp62_ = pixel;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp10_ = page_get_scan_width (_tmp9_);
+			_tmp62__length1 = pixel_length1;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp11_ = y;
+			_tmp63_ = pixel;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = (_tmp10_ - _tmp11_) - 1;
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp12_ = t;
+			_tmp63__length1 = pixel_length1;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp64_ = pixel;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp64__length1 = pixel_length1;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp65_ = pixels;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp65__length1 = pixels_length1;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp66_ = offset;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp67_ = x;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp68_ = _tmp65_[_tmp66_ + _tmp67_];
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp64_[2] = _tmp68_;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp69_ = _tmp64_[2];
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp63_[1] = _tmp69_;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp70_ = _tmp63_[1];
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp62_[0] = _tmp70_;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp71_ = _tmp62_[0];
 #line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			y = _tmp12_;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 616 "page-view.c"
-		}
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 620 "page-view.c"
-		{
-			gint _tmp13_;
-			gint t;
-			gint _tmp14_;
-			Page* _tmp15_;
-			gint _tmp16_ = 0;
-			gint _tmp17_;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp13_ = x;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			t = _tmp13_;
+			return;
+#line 717 "page-view.c"
+		} else {
+			gboolean _tmp72_ = FALSE;
+			gint _tmp73_ = 0;
+			gboolean _tmp75_ = FALSE;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp73_ = depth;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp14_ = y;
+			if (_tmp73_ == 1) {
+#line 726 "page-view.c"
+				gint _tmp74_ = 0;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = _tmp14_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp15_ = page;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp16_ = page_get_scan_height (_tmp15_);
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp17_ = t;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			y = (_tmp16_ - _tmp17_) - 1;
+				_tmp74_ = n_channels;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp72_ = _tmp74_ == 1;
+#line 732 "page-view.c"
+			} else {
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp72_ = FALSE;
+#line 736 "page-view.c"
+			}
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp75_ = _tmp72_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			if (_tmp75_) {
+#line 742 "page-view.c"
+				gint o = 0;
+				gint _tmp76_ = 0;
+				gint _tmp77_ = 0;
+				gint _tmp78_ = 0;
+				guchar* _tmp79_ = NULL;
+				gint _tmp79__length1 = 0;
+				gint _tmp80_ = 0;
+				guchar _tmp81_ = '\0';
+				gint _tmp82_ = 0;
+				guchar* _tmp83_ = NULL;
+				gint _tmp83__length1 = 0;
+				guchar* _tmp84_ = NULL;
+				gint _tmp84__length1 = 0;
+				guchar* _tmp85_ = NULL;
+				gint _tmp85__length1 = 0;
+				gint _tmp86_ = 0;
+				guchar _tmp87_ = '\0';
+				guchar _tmp88_ = '\0';
+				guchar _tmp89_ = '\0';
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			break;
-#line 646 "page-view.c"
-		}
-		default:
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		break;
-#line 651 "page-view.c"
-	}
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = page;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = page_get_depth (_tmp18_);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	depth = _tmp19_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = page;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = page_get_n_channels (_tmp20_);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	n_channels = _tmp21_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = page;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = page_get_pixels (_tmp22_, &_tmp23_);
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	pixels = _tmp24_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	pixels_length1 = _tmp23_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_pixels_size_ = pixels_length1;
+				_tmp76_ = offset;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp77_ = x;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				o = _tmp76_ + (_tmp77_ / 8);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp79_ = pixels;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp79__length1 = pixels_length1;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp80_ = o;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp81_ = _tmp79_[_tmp80_];
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp82_ = x;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				if (((gint) (_tmp81_ & (0x80 >> (_tmp82_ % 8)))) != 0) {
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp78_ = 0x00;
+#line 782 "page-view.c"
+				} else {
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp78_ = 0xFF;
+#line 786 "page-view.c"
+				}
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp83_ = pixel;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp83__length1 = pixel_length1;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp84_ = pixel;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp84__length1 = pixel_length1;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp85_ = pixel;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp85__length1 = pixel_length1;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp86_ = _tmp78_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp85_[2] = (guchar) _tmp86_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp87_ = _tmp85_[2];
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp84_[1] = _tmp87_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp88_ = _tmp84_[1];
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp83_[0] = _tmp88_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp89_ = _tmp83_[0];
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				return;
+#line 816 "page-view.c"
+			} else {
+				gboolean _tmp90_ = FALSE;
+				gint _tmp91_ = 0;
+				gboolean _tmp93_ = FALSE;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = page;
+				_tmp91_ = depth;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp26_ = page_get_rowstride (_tmp25_);
+				if (_tmp91_ == 2) {
+#line 825 "page-view.c"
+					gint _tmp92_ = 0;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp27_ = y;
+					_tmp92_ = n_channels;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	offset = _tmp26_ * _tmp27_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp29_ = depth;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp29_ == 8) {
-#line 687 "page-view.c"
-		gint _tmp30_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp30_ = n_channels;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = _tmp30_ == 3;
-#line 693 "page-view.c"
-	} else {
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = FALSE;
-#line 697 "page-view.c"
-	}
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp31_ = _tmp28_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp31_) {
-#line 703 "page-view.c"
-		gint _tmp32_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gint o;
-		guchar* _tmp35_;
-		gint _tmp35__length1;
-		guchar* _tmp36_;
-		gint _tmp36__length1;
-		gint _tmp37_;
-		guchar _tmp38_;
-		guchar _tmp39_;
-		guchar* _tmp40_;
-		gint _tmp40__length1;
-		guchar* _tmp41_;
-		gint _tmp41__length1;
-		gint _tmp42_;
-		guchar _tmp43_;
-		guchar _tmp44_;
-		guchar* _tmp45_;
-		gint _tmp45__length1;
-		guchar* _tmp46_;
-		gint _tmp46__length1;
-		gint _tmp47_;
-		guchar _tmp48_;
-		guchar _tmp49_;
+					_tmp90_ = _tmp92_ == 1;
+#line 831 "page-view.c"
+				} else {
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp90_ = FALSE;
+#line 835 "page-view.c"
+				}
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp93_ = _tmp90_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				if (_tmp93_) {
+#line 841 "page-view.c"
+					gint block_shift[4] = {0};
+					gint _tmp94_[4] = {0};
+					gint o = 0;
+					gint _tmp95_ = 0;
+					gint _tmp96_ = 0;
+					gint sample = 0;
+					guchar* _tmp97_ = NULL;
+					gint _tmp97__length1 = 0;
+					gint _tmp98_ = 0;
+					guchar _tmp99_ = '\0';
+					gint _tmp100_ = 0;
+					gint _tmp101_ = 0;
+					gint _tmp102_ = 0;
+					guchar* _tmp103_ = NULL;
+					gint _tmp103__length1 = 0;
+					guchar* _tmp104_ = NULL;
+					gint _tmp104__length1 = 0;
+					guchar* _tmp105_ = NULL;
+					gint _tmp105__length1 = 0;
+					gint _tmp106_ = 0;
+					guchar _tmp107_ = '\0';
+					guchar _tmp108_ = '\0';
+					guchar _tmp109_ = '\0';
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp94_[0] = 6;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp94_[1] = 4;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp94_[2] = 2;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp94_[3] = 0;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					memcpy (block_shift, _tmp94_, 4 * sizeof (gint));
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp95_ = offset;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp96_ = x;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					o = _tmp95_ + (_tmp96_ / 4);
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp32_ = offset;
+					_tmp97_ = pixels;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp33_ = x;
+					_tmp97__length1 = pixels_length1;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = n_channels;
+					_tmp98_ = o;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		o = _tmp32_ + (_tmp33_ * _tmp34_);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = pixel;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35__length1 = pixel_length1;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = pixels;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36__length1 = pixels_length1;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp37_ = o;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = _tmp36_[_tmp37_];
+					_tmp99_ = _tmp97_[_tmp98_];
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp100_ = x;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp101_ = block_shift[_tmp100_ % 4];
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					sample = (_tmp99_ >> _tmp101_) & 0x3;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_[0] = _tmp38_;
+					_tmp102_ = sample;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = _tmp35_[0];
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = pixel;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40__length1 = pixel_length1;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = pixels;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41__length1 = pixels_length1;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = o;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = _tmp41_[_tmp42_ + 1];
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_[1] = _tmp43_;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = _tmp40_[1];
+					sample = (_tmp102_ * 255) / 3;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp103_ = pixel;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp103__length1 = pixel_length1;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp104_ = pixel;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp104__length1 = pixel_length1;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = pixel;
+					_tmp105_ = pixel;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45__length1 = pixel_length1;
+					_tmp105__length1 = pixel_length1;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = pixels;
+					_tmp106_ = sample;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46__length1 = pixels_length1;
+					_tmp105_[2] = (guchar) _tmp106_;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = o;
+					_tmp107_ = _tmp105_[2];
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48_ = _tmp46_[_tmp47_ + 2];
+					_tmp104_[1] = _tmp107_;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_[2] = _tmp48_;
+					_tmp108_ = _tmp104_[1];
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = _tmp45_[2];
+					_tmp103_[0] = _tmp108_;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp109_ = _tmp103_[0];
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 787 "page-view.c"
-	} else {
-		gboolean _tmp50_ = FALSE;
-		gint _tmp51_;
-		gboolean _tmp53_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp51_ = depth;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp51_ == 8) {
-#line 796 "page-view.c"
-			gint _tmp52_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp52_ = n_channels;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp50_ = _tmp52_ == 1;
-#line 802 "page-view.c"
-		} else {
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp50_ = FALSE;
-#line 806 "page-view.c"
+					return;
+#line 927 "page-view.c"
+				}
+			}
 		}
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = _tmp50_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp53_) {
-#line 812 "page-view.c"
-			guchar* _tmp54_;
-			gint _tmp54__length1;
-			guchar* _tmp55_;
-			gint _tmp55__length1;
-			guchar* _tmp56_;
-			gint _tmp56__length1;
-			guchar* _tmp57_;
-			gint _tmp57__length1;
-			gint _tmp58_;
-			gint _tmp59_;
-			guchar _tmp60_;
-			guchar _tmp61_;
-			guchar _tmp62_;
-			guchar _tmp63_;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54_ = pixel;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54__length1 = pixel_length1;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55_ = pixel;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55__length1 = pixel_length1;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp56_ = pixel;
+	}
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp56__length1 = pixel_length1;
+	_tmp110_ = pixel;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp57_ = pixels;
+	_tmp110__length1 = pixel_length1;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp57__length1 = pixels_length1;
+	_tmp111_ = pixels;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp58_ = offset;
+	_tmp111__length1 = pixels_length1;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp59_ = x;
+	_tmp112_ = offset;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60_ = _tmp57_[_tmp58_ + _tmp59_];
+	_tmp113_ = x;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp56_[2] = _tmp60_;
+	_tmp114_ = depth;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp61_ = _tmp56_[2];
+	_tmp115_ = x;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55_[1] = _tmp61_;
+	_tmp116_ = n_channels;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_ = _tmp55_[1];
+	_tmp117_ = page_view_get_sample (self, _tmp111_, _tmp111__length1, _tmp112_, _tmp113_, _tmp114_, _tmp115_ * _tmp116_);
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54_[0] = _tmp62_;
+	_tmp110_[0] = _tmp117_;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_ = _tmp54_[0];
+	_tmp118_ = _tmp110_[0];
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			return;
-#line 863 "page-view.c"
-		} else {
-			gboolean _tmp64_ = FALSE;
-			gint _tmp65_;
-			gboolean _tmp67_;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp65_ = depth;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			if (_tmp65_ == 1) {
-#line 872 "page-view.c"
-				gint _tmp66_;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp66_ = n_channels;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp64_ = _tmp66_ == 1;
-#line 878 "page-view.c"
-			} else {
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp64_ = FALSE;
-#line 882 "page-view.c"
-			}
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp67_ = _tmp64_;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			if (_tmp67_) {
-#line 888 "page-view.c"
-				gint _tmp68_;
-				gint _tmp69_;
-				gint o;
-				gint _tmp70_ = 0;
-				guchar* _tmp71_;
-				gint _tmp71__length1;
-				gint _tmp72_;
-				guchar _tmp73_;
-				gint _tmp74_;
-				guchar* _tmp75_;
-				gint _tmp75__length1;
-				guchar* _tmp76_;
-				gint _tmp76__length1;
-				guchar* _tmp77_;
-				gint _tmp77__length1;
-				gint _tmp78_;
-				guchar _tmp79_;
-				guchar _tmp80_;
-				guchar _tmp81_;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp68_ = offset;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp69_ = x;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				o = _tmp68_ + (_tmp69_ / 8);
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp71_ = pixels;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp71__length1 = pixels_length1;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp72_ = o;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp73_ = _tmp71_[_tmp72_];
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp74_ = x;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (((gint) (_tmp73_ & (0x80 >> (_tmp74_ % 8)))) != 0) {
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp70_ = 0x00;
-#line 928 "page-view.c"
-				} else {
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp70_ = 0xFF;
-#line 932 "page-view.c"
-				}
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp75_ = pixel;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp75__length1 = pixel_length1;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp76_ = pixel;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp76__length1 = pixel_length1;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp77_ = pixel;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp77__length1 = pixel_length1;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp78_ = _tmp70_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp77_[2] = (guchar) _tmp78_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp79_ = _tmp77_[2];
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp76_[1] = _tmp79_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp80_ = _tmp76_[1];
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp75_[0] = _tmp80_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp81_ = _tmp75_[0];
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				return;
-#line 962 "page-view.c"
-			} else {
-				gboolean _tmp82_ = FALSE;
-				gint _tmp83_;
-				gboolean _tmp85_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_ = depth;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp83_ == 2) {
-#line 971 "page-view.c"
-					gint _tmp84_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp84_ = n_channels;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp82_ = _tmp84_ == 1;
-#line 977 "page-view.c"
-				} else {
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp82_ = FALSE;
-#line 981 "page-view.c"
-				}
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85_ = _tmp82_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp85_) {
-#line 987 "page-view.c"
-					gint _tmp86_[4] = {0};
-					gint block_shift[4];
-					gint _tmp87_;
-					gint _tmp88_;
-					gint o;
-					guchar* _tmp89_;
-					gint _tmp89__length1;
-					gint _tmp90_;
-					guchar _tmp91_;
-					gint _tmp92_;
-					gint _tmp93_;
-					gint sample;
-					gint _tmp94_;
-					guchar* _tmp95_;
-					gint _tmp95__length1;
-					guchar* _tmp96_;
-					gint _tmp96__length1;
-					guchar* _tmp97_;
-					gint _tmp97__length1;
-					gint _tmp98_;
-					guchar _tmp99_;
-					guchar _tmp100_;
-					guchar _tmp101_;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_[0] = 6;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_[1] = 4;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_[2] = 2;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp86_[3] = 0;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					memcpy (block_shift, _tmp86_, 4 * sizeof (gint));
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp87_ = offset;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp88_ = x;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					o = _tmp87_ + (_tmp88_ / 4);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp89_ = pixels;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp89__length1 = pixels_length1;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp90_ = o;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp91_ = _tmp89_[_tmp90_];
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp92_ = x;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp93_ = block_shift[_tmp92_ % 4];
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					sample = (_tmp91_ >> _tmp93_) & 0x3;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp94_ = sample;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					sample = (_tmp94_ * 255) / 3;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp95_ = pixel;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp95__length1 = pixel_length1;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp96_ = pixel;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp96__length1 = pixel_length1;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp97_ = pixel;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp97__length1 = pixel_length1;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp98_ = sample;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp97_[2] = (guchar) _tmp98_;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp99_ = _tmp97_[2];
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp96_[1] = _tmp99_;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp100_ = _tmp96_[1];
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp95_[0] = _tmp100_;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp101_ = _tmp95_[0];
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					return;
-#line 1073 "page-view.c"
-				}
-			}
-		}
-	}
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp102_ = pixel;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp102__length1 = pixel_length1;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp103_ = pixels;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp103__length1 = pixels_length1;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp104_ = offset;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp105_ = x;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp106_ = depth;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp107_ = x;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp108_ = n_channels;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp109_ = page_view_get_sample (self, _tmp103_, _tmp103__length1, _tmp104_, _tmp105_, _tmp106_, _tmp107_ * _tmp108_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp102_[0] = _tmp109_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp110_ = _tmp102_[0];
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp111_ = pixel;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp111__length1 = pixel_length1;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp112_ = pixels;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp112__length1 = pixels_length1;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp113_ = offset;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp114_ = x;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp115_ = depth;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp116_ = x;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp117_ = n_channels;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp118_ = page_view_get_sample (self, _tmp112_, _tmp112__length1, _tmp113_, _tmp114_, _tmp115_, (_tmp116_ * _tmp117_) + 1);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp111_[1] = _tmp118_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp119_ = _tmp111_[1];
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120_ = pixel;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120__length1 = pixel_length1;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp121_ = pixels;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp121__length1 = pixels_length1;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp122_ = offset;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp123_ = x;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp124_ = depth;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp125_ = x;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp126_ = n_channels;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp127_ = page_view_get_sample (self, _tmp121_, _tmp121__length1, _tmp122_, _tmp123_, _tmp124_, (_tmp125_ * _tmp126_) + 2);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120_[2] = _tmp127_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp128_ = _tmp120_[2];
-#line 1150 "page-view.c"
+	_tmp119_ = pixel;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp119__length1 = pixel_length1;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp120_ = pixels;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp120__length1 = pixels_length1;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp121_ = offset;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp122_ = x;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp123_ = depth;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp124_ = x;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp125_ = n_channels;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp126_ = page_view_get_sample (self, _tmp120_, _tmp120__length1, _tmp121_, _tmp122_, _tmp123_, (_tmp124_ * _tmp125_) + 1);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp119_[1] = _tmp126_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp127_ = _tmp119_[1];
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp128_ = pixel;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp128__length1 = pixel_length1;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp129_ = pixels;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp129__length1 = pixels_length1;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp130_ = offset;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp131_ = x;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp132_ = depth;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp133_ = x;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp134_ = n_channels;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp135_ = page_view_get_sample (self, _tmp129_, _tmp129__length1, _tmp130_, _tmp131_, _tmp132_, (_tmp133_ * _tmp134_) + 2);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp128_[2] = _tmp135_;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp136_ = _tmp128_[2];
+#line 1004 "page-view.c"
 }
 
 
 static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble r, gdouble t, gdouble b, guchar* output, int output_length1, gint offset) {
-	gdouble _tmp0_;
-	gint L;
-	gint _tmp1_;
-	gdouble _tmp2_;
-	gdouble _tmp4_;
-	gint R;
-	gdouble _tmp5_;
-	gint T;
-	gint _tmp6_;
-	gdouble _tmp7_;
-	gdouble _tmp9_;
-	gint B;
-	gdouble red;
-	gdouble green;
-	gdouble blue;
+	gint L = 0;
+	gdouble _tmp0_ = 0.0;
+	gint _tmp1_ = 0;
+	gdouble _tmp2_ = 0.0;
+	gint R = 0;
+	gdouble _tmp4_ = 0.0;
+	gint T = 0;
+	gdouble _tmp5_ = 0.0;
+	gint _tmp6_ = 0;
+	gdouble _tmp7_ = 0.0;
+	gint B = 0;
+	gdouble _tmp9_ = 0.0;
+	gdouble red = 0.0;
+	gdouble green = 0.0;
+	gdouble blue = 0.0;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
-	gdouble _tmp12_;
-	gdouble _tmp13_;
-	gboolean _tmp16_;
-	gboolean _tmp23_;
+	gdouble _tmp12_ = 0.0;
+	gdouble _tmp13_ = 0.0;
+	gboolean _tmp16_ = FALSE;
+	gboolean _tmp23_ = FALSE;
 	gboolean _tmp293_ = FALSE;
-	gdouble _tmp294_;
-	gint _tmp295_;
-	gboolean _tmp298_;
+	gdouble _tmp294_ = 0.0;
+	gint _tmp295_ = 0;
+	gboolean _tmp298_ = FALSE;
 	gboolean _tmp320_ = FALSE;
-	gdouble _tmp321_;
-	gint _tmp322_;
-	gboolean _tmp325_;
+	gdouble _tmp321_ = 0.0;
+	gint _tmp322_ = 0;
+	gboolean _tmp325_ = FALSE;
 	gboolean _tmp347_ = FALSE;
-	gdouble _tmp348_;
-	gint _tmp349_;
-	gboolean _tmp352_;
+	gdouble _tmp348_ = 0.0;
+	gint _tmp349_ = 0;
+	gboolean _tmp352_ = FALSE;
 	gboolean _tmp374_ = FALSE;
-	gdouble _tmp375_;
-	gint _tmp376_;
-	gboolean _tmp379_;
-	gdouble _tmp401_;
-	gdouble _tmp402_;
-	gdouble _tmp403_;
-	gdouble _tmp404_;
-	gdouble scale;
-	guchar* _tmp405_;
-	gint _tmp405__length1;
-	gint _tmp406_;
-	gdouble _tmp407_;
-	gdouble _tmp408_;
-	guchar _tmp409_;
-	guchar* _tmp410_;
-	gint _tmp410__length1;
-	gint _tmp411_;
-	gdouble _tmp412_;
-	gdouble _tmp413_;
-	guchar _tmp414_;
-	guchar* _tmp415_;
-	gint _tmp415__length1;
-	gint _tmp416_;
-	gdouble _tmp417_;
-	gdouble _tmp418_;
-	guchar _tmp419_;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gdouble _tmp375_ = 0.0;
+	gint _tmp376_ = 0;
+	gboolean _tmp379_ = FALSE;
+	gdouble scale = 0.0;
+	gdouble _tmp401_ = 0.0;
+	gdouble _tmp402_ = 0.0;
+	gdouble _tmp403_ = 0.0;
+	gdouble _tmp404_ = 0.0;
+	guchar* _tmp405_ = NULL;
+	gint _tmp405__length1 = 0;
+	gint _tmp406_ = 0;
+	gdouble _tmp407_ = 0.0;
+	gdouble _tmp408_ = 0.0;
+	guchar _tmp409_ = '\0';
+	guchar* _tmp410_ = NULL;
+	gint _tmp410__length1 = 0;
+	gint _tmp411_ = 0;
+	gdouble _tmp412_ = 0.0;
+	gdouble _tmp413_ = 0.0;
+	guchar _tmp414_ = '\0';
+	guchar* _tmp415_ = NULL;
+	gint _tmp415__length1 = 0;
+	gint _tmp416_ = 0;
+	gdouble _tmp417_ = 0.0;
+	gdouble _tmp418_ = 0.0;
+	guchar _tmp419_ = '\0';
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = l;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	L = (gint) _tmp0_;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = L;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = l;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp1_) != _tmp2_) {
-#line 1229 "page-view.c"
-		gint _tmp3_;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1083 "page-view.c"
+		gint _tmp3_ = 0;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp3_ = L;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = _tmp3_ + 1;
-#line 1235 "page-view.c"
+#line 1089 "page-view.c"
 	}
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = r;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	R = (gint) _tmp4_;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = t;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	T = (gint) _tmp5_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = T;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = t;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp6_) != _tmp7_) {
-#line 1251 "page-view.c"
-		gint _tmp8_;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1105 "page-view.c"
+		gint _tmp8_ = 0;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = T;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = _tmp8_ + 1;
-#line 1257 "page-view.c"
+#line 1111 "page-view.c"
 	}
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = b;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	B = (gint) _tmp9_;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	red = 0.0;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	green = 0.0;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	blue = 0.0;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = r;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = l;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if ((_tmp12_ - _tmp13_) <= 1.0) {
-#line 1275 "page-view.c"
-		gdouble _tmp14_;
-		gdouble _tmp15_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1129 "page-view.c"
+		gdouble _tmp14_ = 0.0;
+		gdouble _tmp15_ = 0.0;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp14_ = r;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp15_ = l;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = ((gint) _tmp14_) == ((gint) _tmp15_);
-#line 1284 "page-view.c"
+#line 1138 "page-view.c"
 	} else {
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = FALSE;
-#line 1288 "page-view.c"
+#line 1142 "page-view.c"
 	}
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = _tmp11_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp16_) {
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = TRUE;
-#line 1296 "page-view.c"
+#line 1150 "page-view.c"
 	} else {
 		gboolean _tmp17_ = FALSE;
-		gdouble _tmp18_;
-		gdouble _tmp19_;
-		gboolean _tmp22_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		gdouble _tmp18_ = 0.0;
+		gdouble _tmp19_ = 0.0;
+		gboolean _tmp22_ = FALSE;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp18_ = b;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp19_ = t;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp18_ - _tmp19_) <= 1.0) {
-#line 1308 "page-view.c"
-			gdouble _tmp20_;
-			gdouble _tmp21_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1162 "page-view.c"
+			gdouble _tmp20_ = 0.0;
+			gdouble _tmp21_ = 0.0;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp20_ = b;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp21_ = t;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp17_ = ((gint) _tmp20_) == ((gint) _tmp21_);
-#line 1317 "page-view.c"
+#line 1171 "page-view.c"
 		} else {
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp17_ = FALSE;
-#line 1321 "page-view.c"
+#line 1175 "page-view.c"
 		}
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp22_ = _tmp17_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = _tmp22_;
-#line 1327 "page-view.c"
+#line 1181 "page-view.c"
 	}
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = _tmp10_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp23_) {
-#line 1333 "page-view.c"
+#line 1187 "page-view.c"
 		gboolean _tmp24_ = FALSE;
-		gdouble _tmp25_;
-		gdouble _tmp26_;
-		gboolean _tmp29_;
-		gint _tmp45_;
-		gint _tmp46_;
-		gdouble _tmp173_;
-		gdouble _tmp174_;
-		gdouble _tmp175_;
-		gdouble _tmp176_;
-		gdouble scale;
-		guchar* _tmp177_;
-		gint _tmp177__length1;
-		gint _tmp178_;
-		gdouble _tmp179_;
-		gdouble _tmp180_;
-		guchar _tmp181_;
-		guchar* _tmp182_;
-		gint _tmp182__length1;
-		gint _tmp183_;
-		gdouble _tmp184_;
-		gdouble _tmp185_;
-		guchar _tmp186_;
-		guchar* _tmp187_;
-		gint _tmp187__length1;
-		gint _tmp188_;
-		gdouble _tmp189_;
-		gdouble _tmp190_;
-		guchar _tmp191_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		gdouble _tmp25_ = 0.0;
+		gdouble _tmp26_ = 0.0;
+		gboolean _tmp29_ = FALSE;
+		gint _tmp45_ = 0;
+		gint _tmp46_ = 0;
+		gdouble scale = 0.0;
+		gdouble _tmp173_ = 0.0;
+		gdouble _tmp174_ = 0.0;
+		gdouble _tmp175_ = 0.0;
+		gdouble _tmp176_ = 0.0;
+		guchar* _tmp177_ = NULL;
+		gint _tmp177__length1 = 0;
+		gint _tmp178_ = 0;
+		gdouble _tmp179_ = 0.0;
+		gdouble _tmp180_ = 0.0;
+		guchar _tmp181_ = '\0';
+		guchar* _tmp182_ = NULL;
+		gint _tmp182__length1 = 0;
+		gint _tmp183_ = 0;
+		gdouble _tmp184_ = 0.0;
+		gdouble _tmp185_ = 0.0;
+		guchar _tmp186_ = '\0';
+		guchar* _tmp187_ = NULL;
+		gint _tmp187__length1 = 0;
+		gint _tmp188_ = 0;
+		gdouble _tmp189_ = 0.0;
+		gdouble _tmp190_ = 0.0;
+		guchar _tmp191_ = '\0';
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp25_ = l;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp26_ = r;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((gint) _tmp25_) == ((gint) _tmp26_)) {
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp24_ = TRUE;
-#line 1371 "page-view.c"
+#line 1225 "page-view.c"
 		} else {
-			gdouble _tmp27_;
-			gdouble _tmp28_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			gdouble _tmp27_ = 0.0;
+			gdouble _tmp28_ = 0.0;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp27_ = t;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp28_ = b;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp24_ = ((gint) _tmp27_) == ((gint) _tmp28_);
-#line 1381 "page-view.c"
+#line 1235 "page-view.c"
 		}
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = _tmp24_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp29_) {
-#line 1387 "page-view.c"
+#line 1241 "page-view.c"
 			guchar p[3] = {0};
-			Page* _tmp30_;
-			gdouble _tmp31_;
-			gdouble _tmp32_;
-			guchar* _tmp33_;
-			gint _tmp33__length1;
-			gint _tmp34_;
-			guchar _tmp35_;
-			guchar _tmp36_;
-			guchar* _tmp37_;
-			gint _tmp37__length1;
-			gint _tmp38_;
-			guchar _tmp39_;
-			guchar _tmp40_;
-			guchar* _tmp41_;
-			gint _tmp41__length1;
-			gint _tmp42_;
-			guchar _tmp43_;
-			guchar _tmp44_;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			Page* _tmp30_ = NULL;
+			gdouble _tmp31_ = 0.0;
+			gdouble _tmp32_ = 0.0;
+			guchar* _tmp33_ = NULL;
+			gint _tmp33__length1 = 0;
+			gint _tmp34_ = 0;
+			guchar _tmp35_ = '\0';
+			guchar _tmp36_ = '\0';
+			guchar* _tmp37_ = NULL;
+			gint _tmp37__length1 = 0;
+			gint _tmp38_ = 0;
+			guchar _tmp39_ = '\0';
+			guchar _tmp40_ = '\0';
+			guchar* _tmp41_ = NULL;
+			gint _tmp41__length1 = 0;
+			gint _tmp42_ = 0;
+			guchar _tmp43_ = '\0';
+			guchar _tmp44_ = '\0';
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp30_ = page;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp31_ = l;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp32_ = t;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp30_, (gint) _tmp31_, (gint) _tmp32_, p, 3);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_ = output;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33__length1 = output_length1;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp34_ = offset;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp35_ = p[0];
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_[_tmp34_] = _tmp35_;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp36_ = _tmp33_[_tmp34_];
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_ = output;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37__length1 = output_length1;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp38_ = offset;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp39_ = p[1];
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_[_tmp38_ + 1] = _tmp39_;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp40_ = _tmp37_[_tmp38_ + 1];
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41_ = output;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41__length1 = output_length1;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp42_ = offset;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp43_ = p[2];
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41_[_tmp42_ + 2] = _tmp43_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp44_ = _tmp41_[_tmp42_ + 2];
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
-#line 1453 "page-view.c"
+#line 1307 "page-view.c"
 		}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_ = L;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = R;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp45_ > _tmp46_) {
-#line 1461 "page-view.c"
+#line 1315 "page-view.c"
 			guchar p[3] = {0};
-			Page* _tmp47_;
-			gint _tmp48_;
-			gint _tmp49_;
-			gdouble _tmp50_;
-			guchar _tmp51_;
-			gdouble _tmp52_;
-			gdouble _tmp53_;
-			gint _tmp54_;
-			gdouble _tmp55_;
-			gdouble _tmp56_;
-			guchar _tmp57_;
-			gdouble _tmp58_;
-			gdouble _tmp59_;
-			gint _tmp60_;
-			gdouble _tmp61_;
-			gdouble _tmp62_;
-			guchar _tmp63_;
-			gdouble _tmp64_;
-			gdouble _tmp65_;
-			gint _tmp66_;
-			gdouble _tmp67_;
-			Page* _tmp89_;
-			gint _tmp90_;
-			gint _tmp91_;
-			gdouble _tmp92_;
-			guchar _tmp93_;
-			gdouble _tmp94_;
-			gdouble _tmp95_;
-			gdouble _tmp96_;
-			gint _tmp97_;
-			gdouble _tmp98_;
-			guchar _tmp99_;
-			gdouble _tmp100_;
-			gdouble _tmp101_;
-			gdouble _tmp102_;
-			gint _tmp103_;
-			gdouble _tmp104_;
-			guchar _tmp105_;
-			gdouble _tmp106_;
-			gdouble _tmp107_;
-			gdouble _tmp108_;
-			gint _tmp109_;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			Page* _tmp47_ = NULL;
+			gint _tmp48_ = 0;
+			gint _tmp49_ = 0;
+			gdouble _tmp50_ = 0.0;
+			guchar _tmp51_ = '\0';
+			gdouble _tmp52_ = 0.0;
+			gdouble _tmp53_ = 0.0;
+			gint _tmp54_ = 0;
+			gdouble _tmp55_ = 0.0;
+			gdouble _tmp56_ = 0.0;
+			guchar _tmp57_ = '\0';
+			gdouble _tmp58_ = 0.0;
+			gdouble _tmp59_ = 0.0;
+			gint _tmp60_ = 0;
+			gdouble _tmp61_ = 0.0;
+			gdouble _tmp62_ = 0.0;
+			guchar _tmp63_ = '\0';
+			gdouble _tmp64_ = 0.0;
+			gdouble _tmp65_ = 0.0;
+			gint _tmp66_ = 0;
+			gdouble _tmp67_ = 0.0;
+			Page* _tmp89_ = NULL;
+			gint _tmp90_ = 0;
+			gint _tmp91_ = 0;
+			gdouble _tmp92_ = 0.0;
+			guchar _tmp93_ = '\0';
+			gdouble _tmp94_ = 0.0;
+			gdouble _tmp95_ = 0.0;
+			gdouble _tmp96_ = 0.0;
+			gint _tmp97_ = 0;
+			gdouble _tmp98_ = 0.0;
+			guchar _tmp99_ = '\0';
+			gdouble _tmp100_ = 0.0;
+			gdouble _tmp101_ = 0.0;
+			gdouble _tmp102_ = 0.0;
+			gint _tmp103_ = 0;
+			gdouble _tmp104_ = 0.0;
+			guchar _tmp105_ = '\0';
+			gdouble _tmp106_ = 0.0;
+			gdouble _tmp107_ = 0.0;
+			gdouble _tmp108_ = 0.0;
+			gint _tmp109_ = 0;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp47_ = page;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp48_ = R;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp49_ = T;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp47_, _tmp48_, _tmp49_ - 1, p, 3);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp50_ = red;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp51_ = p[0];
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp52_ = r;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp53_ = l;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54_ = T;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55_ = t;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp50_ + ((_tmp51_ * (_tmp52_ - _tmp53_)) * (_tmp54_ - _tmp55_));
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp56_ = green;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57_ = p[1];
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp58_ = r;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp59_ = l;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60_ = T;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61_ = t;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp56_ + ((_tmp57_ * (_tmp58_ - _tmp59_)) * (_tmp60_ - _tmp61_));
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62_ = blue;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63_ = p[2];
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp64_ = r;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp65_ = l;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp66_ = T;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp67_ = t;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp62_ + ((_tmp63_ * (_tmp64_ - _tmp65_)) * (_tmp66_ - _tmp67_));
-#line 1555 "page-view.c"
+#line 1409 "page-view.c"
 			{
-				gint _tmp68_;
-				gint y;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint y = 0;
+				gint _tmp68_ = 0;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp68_ = T;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y = _tmp68_;
-#line 1563 "page-view.c"
+#line 1417 "page-view.c"
 				{
-					gboolean _tmp69_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					gboolean _tmp69_ = FALSE;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp69_ = TRUE;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
-#line 1570 "page-view.c"
-						gboolean _tmp70_;
-						gint _tmp72_;
-						gint _tmp73_;
-						Page* _tmp74_;
-						gint _tmp75_;
-						gint _tmp76_;
-						gdouble _tmp77_;
-						guchar _tmp78_;
-						gdouble _tmp79_;
-						gdouble _tmp80_;
-						gdouble _tmp81_;
-						guchar _tmp82_;
-						gdouble _tmp83_;
-						gdouble _tmp84_;
-						gdouble _tmp85_;
-						guchar _tmp86_;
-						gdouble _tmp87_;
-						gdouble _tmp88_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1424 "page-view.c"
+						gboolean _tmp70_ = FALSE;
+						gint _tmp72_ = 0;
+						gint _tmp73_ = 0;
+						Page* _tmp74_ = NULL;
+						gint _tmp75_ = 0;
+						gint _tmp76_ = 0;
+						gdouble _tmp77_ = 0.0;
+						guchar _tmp78_ = '\0';
+						gdouble _tmp79_ = 0.0;
+						gdouble _tmp80_ = 0.0;
+						gdouble _tmp81_ = 0.0;
+						guchar _tmp82_ = '\0';
+						gdouble _tmp83_ = 0.0;
+						gdouble _tmp84_ = 0.0;
+						gdouble _tmp85_ = 0.0;
+						guchar _tmp86_ = '\0';
+						gdouble _tmp87_ = 0.0;
+						gdouble _tmp88_ = 0.0;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp70_ = _tmp69_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!_tmp70_) {
-#line 1593 "page-view.c"
-							gint _tmp71_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1447 "page-view.c"
+							gint _tmp71_ = 0;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp71_ = y;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							y = _tmp71_ + 1;
-#line 1599 "page-view.c"
+#line 1453 "page-view.c"
 						}
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp69_ = FALSE;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp72_ = y;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp73_ = B;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!(_tmp72_ < _tmp73_)) {
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
-#line 1611 "page-view.c"
+#line 1465 "page-view.c"
 						}
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp74_ = page;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp75_ = R;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp76_ = y;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						page_view_get_pixel (self, _tmp74_, _tmp75_, _tmp76_, p, 3);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp77_ = red;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp78_ = p[0];
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp79_ = r;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp80_ = l;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						red = _tmp77_ + (_tmp78_ * (_tmp79_ - _tmp80_));
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp81_ = green;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp82_ = p[1];
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp83_ = r;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp84_ = l;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						green = _tmp81_ + (_tmp82_ * (_tmp83_ - _tmp84_));
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp85_ = blue;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp86_ = p[2];
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp87_ = r;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp88_ = l;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						blue = _tmp85_ + (_tmp86_ * (_tmp87_ - _tmp88_));
-#line 1651 "page-view.c"
+#line 1505 "page-view.c"
 					}
 				}
 			}
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp89_ = page;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp90_ = R;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp91_ = B;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp89_, _tmp90_, _tmp91_, p, 3);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp92_ = red;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp93_ = p[0];
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp94_ = r;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp95_ = l;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp96_ = b;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp97_ = B;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp92_ + ((_tmp93_ * (_tmp94_ - _tmp95_)) * (_tmp96_ - _tmp97_));
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp98_ = green;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp99_ = p[1];
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp100_ = r;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp101_ = l;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp102_ = b;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp103_ = B;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp98_ + ((_tmp99_ * (_tmp100_ - _tmp101_)) * (_tmp102_ - _tmp103_));
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp104_ = blue;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp105_ = p[2];
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp106_ = r;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp107_ = l;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp108_ = b;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp109_ = B;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp104_ + ((_tmp105_ * (_tmp106_ - _tmp107_)) * (_tmp108_ - _tmp109_));
-#line 1705 "page-view.c"
+#line 1559 "page-view.c"
 		} else {
 			guchar p[3] = {0};
-			Page* _tmp110_;
-			gint _tmp111_;
-			gint _tmp112_;
-			gdouble _tmp113_;
-			guchar _tmp114_;
-			gdouble _tmp115_;
-			gdouble _tmp116_;
-			gint _tmp117_;
-			gdouble _tmp118_;
-			gdouble _tmp119_;
-			guchar _tmp120_;
-			gdouble _tmp121_;
-			gdouble _tmp122_;
-			gint _tmp123_;
-			gdouble _tmp124_;
-			gdouble _tmp125_;
-			guchar _tmp126_;
-			gdouble _tmp127_;
-			gdouble _tmp128_;
-			gint _tmp129_;
-			gdouble _tmp130_;
-			Page* _tmp152_;
-			gint _tmp153_;
-			gint _tmp154_;
-			gdouble _tmp155_;
-			guchar _tmp156_;
-			gdouble _tmp157_;
-			gdouble _tmp158_;
-			gdouble _tmp159_;
-			gint _tmp160_;
-			gdouble _tmp161_;
-			guchar _tmp162_;
-			gdouble _tmp163_;
-			gdouble _tmp164_;
-			gdouble _tmp165_;
-			gint _tmp166_;
-			gdouble _tmp167_;
-			guchar _tmp168_;
-			gdouble _tmp169_;
-			gdouble _tmp170_;
-			gdouble _tmp171_;
-			gint _tmp172_;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			Page* _tmp110_ = NULL;
+			gint _tmp111_ = 0;
+			gint _tmp112_ = 0;
+			gdouble _tmp113_ = 0.0;
+			guchar _tmp114_ = '\0';
+			gdouble _tmp115_ = 0.0;
+			gdouble _tmp116_ = 0.0;
+			gint _tmp117_ = 0;
+			gdouble _tmp118_ = 0.0;
+			gdouble _tmp119_ = 0.0;
+			guchar _tmp120_ = '\0';
+			gdouble _tmp121_ = 0.0;
+			gdouble _tmp122_ = 0.0;
+			gint _tmp123_ = 0;
+			gdouble _tmp124_ = 0.0;
+			gdouble _tmp125_ = 0.0;
+			guchar _tmp126_ = '\0';
+			gdouble _tmp127_ = 0.0;
+			gdouble _tmp128_ = 0.0;
+			gint _tmp129_ = 0;
+			gdouble _tmp130_ = 0.0;
+			Page* _tmp152_ = NULL;
+			gint _tmp153_ = 0;
+			gint _tmp154_ = 0;
+			gdouble _tmp155_ = 0.0;
+			guchar _tmp156_ = '\0';
+			gdouble _tmp157_ = 0.0;
+			gdouble _tmp158_ = 0.0;
+			gdouble _tmp159_ = 0.0;
+			gint _tmp160_ = 0;
+			gdouble _tmp161_ = 0.0;
+			guchar _tmp162_ = '\0';
+			gdouble _tmp163_ = 0.0;
+			gdouble _tmp164_ = 0.0;
+			gdouble _tmp165_ = 0.0;
+			gint _tmp166_ = 0;
+			gdouble _tmp167_ = 0.0;
+			guchar _tmp168_ = '\0';
+			gdouble _tmp169_ = 0.0;
+			gdouble _tmp170_ = 0.0;
+			gdouble _tmp171_ = 0.0;
+			gint _tmp172_ = 0;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp110_ = page;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp111_ = L;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp112_ = B;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp110_, _tmp111_ - 1, _tmp112_, p, 3);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp113_ = red;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp114_ = p[0];
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp115_ = b;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp116_ = t;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp117_ = L;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp118_ = l;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp113_ + ((_tmp114_ * (_tmp115_ - _tmp116_)) * (_tmp117_ - _tmp118_));
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp119_ = green;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp120_ = p[1];
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp121_ = b;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp122_ = t;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp123_ = L;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp124_ = l;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp119_ + ((_tmp120_ * (_tmp121_ - _tmp122_)) * (_tmp123_ - _tmp124_));
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp125_ = blue;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp126_ = p[2];
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp127_ = b;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp128_ = t;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp129_ = L;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp130_ = l;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp125_ + ((_tmp126_ * (_tmp127_ - _tmp128_)) * (_tmp129_ - _tmp130_));
-#line 1800 "page-view.c"
+#line 1654 "page-view.c"
 			{
-				gint _tmp131_;
-				gint x;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint x = 0;
+				gint _tmp131_ = 0;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp131_ = L;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x = _tmp131_;
-#line 1808 "page-view.c"
+#line 1662 "page-view.c"
 				{
-					gboolean _tmp132_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					gboolean _tmp132_ = FALSE;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp132_ = TRUE;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
-#line 1815 "page-view.c"
-						gboolean _tmp133_;
-						gint _tmp135_;
-						gint _tmp136_;
-						Page* _tmp137_;
-						gint _tmp138_;
-						gint _tmp139_;
-						gdouble _tmp140_;
-						guchar _tmp141_;
-						gdouble _tmp142_;
-						gdouble _tmp143_;
-						gdouble _tmp144_;
-						guchar _tmp145_;
-						gdouble _tmp146_;
-						gdouble _tmp147_;
-						gdouble _tmp148_;
-						guchar _tmp149_;
-						gdouble _tmp150_;
-						gdouble _tmp151_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1669 "page-view.c"
+						gboolean _tmp133_ = FALSE;
+						gint _tmp135_ = 0;
+						gint _tmp136_ = 0;
+						Page* _tmp137_ = NULL;
+						gint _tmp138_ = 0;
+						gint _tmp139_ = 0;
+						gdouble _tmp140_ = 0.0;
+						guchar _tmp141_ = '\0';
+						gdouble _tmp142_ = 0.0;
+						gdouble _tmp143_ = 0.0;
+						gdouble _tmp144_ = 0.0;
+						guchar _tmp145_ = '\0';
+						gdouble _tmp146_ = 0.0;
+						gdouble _tmp147_ = 0.0;
+						gdouble _tmp148_ = 0.0;
+						guchar _tmp149_ = '\0';
+						gdouble _tmp150_ = 0.0;
+						gdouble _tmp151_ = 0.0;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp133_ = _tmp132_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!_tmp133_) {
-#line 1838 "page-view.c"
-							gint _tmp134_;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1692 "page-view.c"
+							gint _tmp134_ = 0;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp134_ = x;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							x = _tmp134_ + 1;
-#line 1844 "page-view.c"
+#line 1698 "page-view.c"
 						}
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp132_ = FALSE;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp135_ = x;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp136_ = R;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!(_tmp135_ < _tmp136_)) {
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
-#line 1856 "page-view.c"
+#line 1710 "page-view.c"
 						}
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp137_ = page;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp138_ = x;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp139_ = B;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						page_view_get_pixel (self, _tmp137_, _tmp138_, _tmp139_, p, 3);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp140_ = red;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp141_ = p[0];
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp142_ = b;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp143_ = t;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						red = _tmp140_ + (_tmp141_ * (_tmp142_ - _tmp143_));
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp144_ = green;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp145_ = p[1];
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp146_ = b;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp147_ = t;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						green = _tmp144_ + (_tmp145_ * (_tmp146_ - _tmp147_));
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp148_ = blue;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp149_ = p[2];
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp150_ = b;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp151_ = t;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						blue = _tmp148_ + (_tmp149_ * (_tmp150_ - _tmp151_));
-#line 1896 "page-view.c"
+#line 1750 "page-view.c"
 					}
 				}
 			}
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp152_ = page;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp153_ = R;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp154_ = B;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp152_, _tmp153_, _tmp154_, p, 3);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp155_ = red;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp156_ = p[0];
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp157_ = b;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp158_ = t;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp159_ = r;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp160_ = R;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp155_ + ((_tmp156_ * (_tmp157_ - _tmp158_)) * (_tmp159_ - _tmp160_));
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp161_ = green;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp162_ = p[1];
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp163_ = b;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp164_ = t;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp165_ = r;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp166_ = R;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp161_ + ((_tmp162_ * (_tmp163_ - _tmp164_)) * (_tmp165_ - _tmp166_));
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp167_ = blue;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp168_ = p[2];
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp169_ = b;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp170_ = t;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp171_ = r;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp172_ = R;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp167_ + ((_tmp168_ * (_tmp169_ - _tmp170_)) * (_tmp171_ - _tmp172_));
-#line 1950 "page-view.c"
+#line 1804 "page-view.c"
 		}
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp173_ = r;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp174_ = l;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp175_ = b;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp176_ = t;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		scale = 1.0 / ((_tmp173_ - _tmp174_) * (_tmp175_ - _tmp176_));
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177_ = output;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177__length1 = output_length1;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp178_ = offset;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp179_ = red;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp180_ = scale;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177_[_tmp178_] = (guchar) ((_tmp179_ * _tmp180_) + 0.5);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp181_ = _tmp177_[_tmp178_];
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182_ = output;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182__length1 = output_length1;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp183_ = offset;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp184_ = green;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp185_ = scale;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182_[_tmp183_ + 1] = (guchar) ((_tmp184_ * _tmp185_) + 0.5);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp186_ = _tmp182_[_tmp183_ + 1];
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp187_ = output;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp187__length1 = output_length1;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp188_ = offset;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp189_ = blue;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp190_ = scale;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp187_[_tmp188_ + 2] = (guchar) ((_tmp189_ * _tmp190_) + 0.5);
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp191_ = _tmp187_[_tmp188_ + 2];
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 2006 "page-view.c"
+#line 1860 "page-view.c"
 	}
 	{
-		gint _tmp192_;
-		gint x;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		gint x = 0;
+		gint _tmp192_ = 0;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp192_ = L;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp192_;
-#line 2015 "page-view.c"
+#line 1869 "page-view.c"
 		{
-			gboolean _tmp193_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			gboolean _tmp193_ = FALSE;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp193_ = TRUE;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 2022 "page-view.c"
-				gboolean _tmp194_;
-				gint _tmp196_;
-				gint _tmp197_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1876 "page-view.c"
+				gboolean _tmp194_ = FALSE;
+				gint _tmp196_ = 0;
+				gint _tmp197_ = 0;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp194_ = _tmp193_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp194_) {
-#line 2030 "page-view.c"
-					gint _tmp195_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1884 "page-view.c"
+					gint _tmp195_ = 0;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp195_ = x;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp195_ + 1;
-#line 2036 "page-view.c"
+#line 1890 "page-view.c"
 				}
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp193_ = FALSE;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp196_ = x;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp197_ = R;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp196_ < _tmp197_)) {
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 2048 "page-view.c"
+#line 1902 "page-view.c"
 				}
 				{
-					gint _tmp198_;
-					gint y;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					gint y = 0;
+					gint _tmp198_ = 0;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp198_ = T;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp198_;
-#line 2057 "page-view.c"
+#line 1911 "page-view.c"
 					{
-						gboolean _tmp199_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						gboolean _tmp199_ = FALSE;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp199_ = TRUE;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
-#line 2064 "page-view.c"
-							gboolean _tmp200_;
-							gint _tmp202_;
-							gint _tmp203_;
+#line 1918 "page-view.c"
+							gboolean _tmp200_ = FALSE;
+							gint _tmp202_ = 0;
+							gint _tmp203_ = 0;
 							guchar p[3] = {0};
-							Page* _tmp204_;
-							gint _tmp205_;
-							gint _tmp206_;
-							gdouble _tmp207_;
-							guchar _tmp208_;
-							gdouble _tmp209_;
-							guchar _tmp210_;
-							gdouble _tmp211_;
-							guchar _tmp212_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							Page* _tmp204_ = NULL;
+							gint _tmp205_ = 0;
+							gint _tmp206_ = 0;
+							gdouble _tmp207_ = 0.0;
+							guchar _tmp208_ = '\0';
+							gdouble _tmp209_ = 0.0;
+							guchar _tmp210_ = '\0';
+							gdouble _tmp211_ = 0.0;
+							guchar _tmp212_ = '\0';
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp200_ = _tmp199_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!_tmp200_) {
-#line 2082 "page-view.c"
-								gint _tmp201_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1936 "page-view.c"
+								gint _tmp201_ = 0;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp201_ = y;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								y = _tmp201_ + 1;
-#line 2088 "page-view.c"
+#line 1942 "page-view.c"
 							}
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp199_ = FALSE;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp202_ = y;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp203_ = B;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!(_tmp202_ < _tmp203_)) {
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
-#line 2100 "page-view.c"
+#line 1954 "page-view.c"
 							}
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp204_ = page;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp205_ = x;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp206_ = y;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							page_view_get_pixel (self, _tmp204_, _tmp205_, _tmp206_, p, 3);
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp207_ = red;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp208_ = p[0];
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							red = _tmp207_ + _tmp208_;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp209_ = green;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp210_ = p[1];
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							green = _tmp209_ + _tmp210_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp211_ = blue;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp212_ = p[2];
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							blue = _tmp211_ + _tmp212_;
-#line 2128 "page-view.c"
+#line 1982 "page-view.c"
 						}
 					}
 				}
@@ -2132,1535 +1986,1553 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		}
 	}
 	{
-		gint _tmp213_;
-		gint x;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		gint x = 0;
+		gint _tmp213_ = 0;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp213_ = L;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp213_;
-#line 2142 "page-view.c"
+#line 1996 "page-view.c"
 		{
-			gboolean _tmp214_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			gboolean _tmp214_ = FALSE;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp214_ = TRUE;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 2149 "page-view.c"
-				gboolean _tmp215_;
-				gint _tmp217_;
-				gint _tmp218_;
-				gdouble _tmp219_;
-				gint _tmp220_;
-				gdouble _tmp236_;
-				gint _tmp237_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2003 "page-view.c"
+				gboolean _tmp215_ = FALSE;
+				gint _tmp217_ = 0;
+				gint _tmp218_ = 0;
+				gdouble _tmp219_ = 0.0;
+				gint _tmp220_ = 0;
+				gdouble _tmp236_ = 0.0;
+				gint _tmp237_ = 0;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp215_ = _tmp214_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp215_) {
-#line 2161 "page-view.c"
-					gint _tmp216_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2015 "page-view.c"
+					gint _tmp216_ = 0;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp216_ = x;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp216_ + 1;
-#line 2167 "page-view.c"
+#line 2021 "page-view.c"
 				}
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp214_ = FALSE;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp217_ = x;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp218_ = R;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp217_ < _tmp218_)) {
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 2179 "page-view.c"
+#line 2033 "page-view.c"
 				}
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp219_ = t;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp220_ = T;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp219_ != ((gdouble) _tmp220_)) {
-#line 2187 "page-view.c"
+#line 2041 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp221_;
-					gint _tmp222_;
-					gint _tmp223_;
-					gdouble _tmp224_;
-					guchar _tmp225_;
-					gint _tmp226_;
-					gdouble _tmp227_;
-					gdouble _tmp228_;
-					guchar _tmp229_;
-					gint _tmp230_;
-					gdouble _tmp231_;
-					gdouble _tmp232_;
-					guchar _tmp233_;
-					gint _tmp234_;
-					gdouble _tmp235_;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					Page* _tmp221_ = NULL;
+					gint _tmp222_ = 0;
+					gint _tmp223_ = 0;
+					gdouble _tmp224_ = 0.0;
+					guchar _tmp225_ = '\0';
+					gint _tmp226_ = 0;
+					gdouble _tmp227_ = 0.0;
+					gdouble _tmp228_ = 0.0;
+					guchar _tmp229_ = '\0';
+					gint _tmp230_ = 0;
+					gdouble _tmp231_ = 0.0;
+					gdouble _tmp232_ = 0.0;
+					guchar _tmp233_ = '\0';
+					gint _tmp234_ = 0;
+					gdouble _tmp235_ = 0.0;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp221_ = page;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp222_ = x;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp223_ = T;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp221_, _tmp222_, _tmp223_ - 1, p, 3);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp224_ = red;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp225_ = p[0];
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp226_ = T;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp227_ = t;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp224_ + (_tmp225_ * (_tmp226_ - _tmp227_));
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp228_ = green;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp229_ = p[1];
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp230_ = T;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp231_ = t;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp228_ + (_tmp229_ * (_tmp230_ - _tmp231_));
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp232_ = blue;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp233_ = p[2];
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp234_ = T;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp235_ = t;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp232_ + (_tmp233_ * (_tmp234_ - _tmp235_));
-#line 2242 "page-view.c"
+#line 2096 "page-view.c"
 				}
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp236_ = b;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp237_ = B;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp236_ != ((gdouble) _tmp237_)) {
-#line 2250 "page-view.c"
+#line 2104 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp238_;
-					gint _tmp239_;
-					gint _tmp240_;
-					gdouble _tmp241_;
-					guchar _tmp242_;
-					gdouble _tmp243_;
-					gint _tmp244_;
-					gdouble _tmp245_;
-					guchar _tmp246_;
-					gdouble _tmp247_;
-					gint _tmp248_;
-					gdouble _tmp249_;
-					guchar _tmp250_;
-					gdouble _tmp251_;
-					gint _tmp252_;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					Page* _tmp238_ = NULL;
+					gint _tmp239_ = 0;
+					gint _tmp240_ = 0;
+					gdouble _tmp241_ = 0.0;
+					guchar _tmp242_ = '\0';
+					gdouble _tmp243_ = 0.0;
+					gint _tmp244_ = 0;
+					gdouble _tmp245_ = 0.0;
+					guchar _tmp246_ = '\0';
+					gdouble _tmp247_ = 0.0;
+					gint _tmp248_ = 0;
+					gdouble _tmp249_ = 0.0;
+					guchar _tmp250_ = '\0';
+					gdouble _tmp251_ = 0.0;
+					gint _tmp252_ = 0;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp238_ = page;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp239_ = x;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp240_ = B;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp238_, _tmp239_, _tmp240_, p, 3);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp241_ = red;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp242_ = p[0];
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp243_ = b;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp244_ = B;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp241_ + (_tmp242_ * (_tmp243_ - _tmp244_));
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp245_ = green;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp246_ = p[1];
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp247_ = b;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp248_ = B;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp245_ + (_tmp246_ * (_tmp247_ - _tmp248_));
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp249_ = blue;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp250_ = p[2];
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp251_ = b;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp252_ = B;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp249_ + (_tmp250_ * (_tmp251_ - _tmp252_));
-#line 2305 "page-view.c"
+#line 2159 "page-view.c"
 				}
 			}
 		}
 	}
 	{
-		gint _tmp253_;
-		gint y;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		gint y = 0;
+		gint _tmp253_ = 0;
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp253_ = T;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp253_;
-#line 2317 "page-view.c"
+#line 2171 "page-view.c"
 		{
-			gboolean _tmp254_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			gboolean _tmp254_ = FALSE;
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp254_ = TRUE;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 2324 "page-view.c"
-				gboolean _tmp255_;
-				gint _tmp257_;
-				gint _tmp258_;
-				gdouble _tmp259_;
-				gint _tmp260_;
-				gdouble _tmp276_;
-				gint _tmp277_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2178 "page-view.c"
+				gboolean _tmp255_ = FALSE;
+				gint _tmp257_ = 0;
+				gint _tmp258_ = 0;
+				gdouble _tmp259_ = 0.0;
+				gint _tmp260_ = 0;
+				gdouble _tmp276_ = 0.0;
+				gint _tmp277_ = 0;
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp255_ = _tmp254_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp255_) {
-#line 2336 "page-view.c"
-					gint _tmp256_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2190 "page-view.c"
+					gint _tmp256_ = 0;
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp256_ = y;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp256_ + 1;
-#line 2342 "page-view.c"
+#line 2196 "page-view.c"
 				}
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp254_ = FALSE;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp257_ = y;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp258_ = B;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp257_ < _tmp258_)) {
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 2354 "page-view.c"
+#line 2208 "page-view.c"
 				}
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp259_ = l;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp260_ = L;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp259_ != ((gdouble) _tmp260_)) {
-#line 2362 "page-view.c"
+#line 2216 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp261_;
-					gint _tmp262_;
-					gint _tmp263_;
-					gdouble _tmp264_;
-					guchar _tmp265_;
-					gint _tmp266_;
-					gdouble _tmp267_;
-					gdouble _tmp268_;
-					guchar _tmp269_;
-					gint _tmp270_;
-					gdouble _tmp271_;
-					gdouble _tmp272_;
-					guchar _tmp273_;
-					gint _tmp274_;
-					gdouble _tmp275_;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					Page* _tmp261_ = NULL;
+					gint _tmp262_ = 0;
+					gint _tmp263_ = 0;
+					gdouble _tmp264_ = 0.0;
+					guchar _tmp265_ = '\0';
+					gint _tmp266_ = 0;
+					gdouble _tmp267_ = 0.0;
+					gdouble _tmp268_ = 0.0;
+					guchar _tmp269_ = '\0';
+					gint _tmp270_ = 0;
+					gdouble _tmp271_ = 0.0;
+					gdouble _tmp272_ = 0.0;
+					guchar _tmp273_ = '\0';
+					gint _tmp274_ = 0;
+					gdouble _tmp275_ = 0.0;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp261_ = page;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp262_ = L;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp263_ = y;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp261_, _tmp262_ - 1, _tmp263_, p, 3);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp264_ = red;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp265_ = p[0];
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp266_ = L;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp267_ = l;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp264_ + (_tmp265_ * (_tmp266_ - _tmp267_));
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp268_ = green;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp269_ = p[1];
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp270_ = L;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp271_ = l;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp268_ + (_tmp269_ * (_tmp270_ - _tmp271_));
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp272_ = blue;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp273_ = p[2];
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp274_ = L;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp275_ = l;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp272_ + (_tmp273_ * (_tmp274_ - _tmp275_));
-#line 2417 "page-view.c"
+#line 2271 "page-view.c"
 				}
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp276_ = r;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp277_ = R;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp276_ != ((gdouble) _tmp277_)) {
-#line 2425 "page-view.c"
+#line 2279 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp278_;
-					gint _tmp279_;
-					gint _tmp280_;
-					gdouble _tmp281_;
-					guchar _tmp282_;
-					gdouble _tmp283_;
-					gint _tmp284_;
-					gdouble _tmp285_;
-					guchar _tmp286_;
-					gdouble _tmp287_;
-					gint _tmp288_;
-					gdouble _tmp289_;
-					guchar _tmp290_;
-					gdouble _tmp291_;
-					gint _tmp292_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					Page* _tmp278_ = NULL;
+					gint _tmp279_ = 0;
+					gint _tmp280_ = 0;
+					gdouble _tmp281_ = 0.0;
+					guchar _tmp282_ = '\0';
+					gdouble _tmp283_ = 0.0;
+					gint _tmp284_ = 0;
+					gdouble _tmp285_ = 0.0;
+					guchar _tmp286_ = '\0';
+					gdouble _tmp287_ = 0.0;
+					gint _tmp288_ = 0;
+					gdouble _tmp289_ = 0.0;
+					guchar _tmp290_ = '\0';
+					gdouble _tmp291_ = 0.0;
+					gint _tmp292_ = 0;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp278_ = page;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp279_ = R;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp280_ = y;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp278_, _tmp279_, _tmp280_, p, 3);
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp281_ = red;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp282_ = p[0];
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp283_ = r;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp284_ = R;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp281_ + (_tmp282_ * (_tmp283_ - _tmp284_));
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp285_ = green;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp286_ = p[1];
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp287_ = r;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp288_ = R;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp285_ + (_tmp286_ * (_tmp287_ - _tmp288_));
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp289_ = blue;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp290_ = p[2];
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp291_ = r;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp292_ = R;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp289_ + (_tmp290_ * (_tmp291_ - _tmp292_));
-#line 2480 "page-view.c"
+#line 2334 "page-view.c"
 				}
 			}
 		}
 	}
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp294_ = l;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp295_ = L;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp294_ != ((gdouble) _tmp295_)) {
-#line 2491 "page-view.c"
-		gdouble _tmp296_;
-		gint _tmp297_;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2345 "page-view.c"
+		gdouble _tmp296_ = 0.0;
+		gint _tmp297_ = 0;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp296_ = t;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp297_ = T;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp293_ = _tmp296_ != ((gdouble) _tmp297_);
-#line 2500 "page-view.c"
+#line 2354 "page-view.c"
 	} else {
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp293_ = FALSE;
-#line 2504 "page-view.c"
+#line 2358 "page-view.c"
 	}
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp298_ = _tmp293_;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp298_) {
-#line 2510 "page-view.c"
+#line 2364 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp299_;
-		gint _tmp300_;
-		gint _tmp301_;
-		gdouble _tmp302_;
-		guchar _tmp303_;
-		gint _tmp304_;
-		gdouble _tmp305_;
-		gint _tmp306_;
-		gdouble _tmp307_;
-		gdouble _tmp308_;
-		guchar _tmp309_;
-		gint _tmp310_;
-		gdouble _tmp311_;
-		gint _tmp312_;
-		gdouble _tmp313_;
-		gdouble _tmp314_;
-		guchar _tmp315_;
-		gint _tmp316_;
-		gdouble _tmp317_;
-		gint _tmp318_;
-		gdouble _tmp319_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		Page* _tmp299_ = NULL;
+		gint _tmp300_ = 0;
+		gint _tmp301_ = 0;
+		gdouble _tmp302_ = 0.0;
+		guchar _tmp303_ = '\0';
+		gint _tmp304_ = 0;
+		gdouble _tmp305_ = 0.0;
+		gint _tmp306_ = 0;
+		gdouble _tmp307_ = 0.0;
+		gdouble _tmp308_ = 0.0;
+		guchar _tmp309_ = '\0';
+		gint _tmp310_ = 0;
+		gdouble _tmp311_ = 0.0;
+		gint _tmp312_ = 0;
+		gdouble _tmp313_ = 0.0;
+		gdouble _tmp314_ = 0.0;
+		guchar _tmp315_ = '\0';
+		gint _tmp316_ = 0;
+		gdouble _tmp317_ = 0.0;
+		gint _tmp318_ = 0;
+		gdouble _tmp319_ = 0.0;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp299_ = page;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp300_ = L;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp301_ = T;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp299_, _tmp300_ - 1, _tmp301_ - 1, p, 3);
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp302_ = red;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp303_ = p[0];
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp304_ = L;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp305_ = l;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp306_ = T;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp307_ = t;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp302_ + ((_tmp303_ * (_tmp304_ - _tmp305_)) * (_tmp306_ - _tmp307_));
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp308_ = green;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp309_ = p[1];
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp310_ = L;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp311_ = l;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp312_ = T;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp313_ = t;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp308_ + ((_tmp309_ * (_tmp310_ - _tmp311_)) * (_tmp312_ - _tmp313_));
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp314_ = blue;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp315_ = p[2];
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp316_ = L;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp317_ = l;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp318_ = T;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp319_ = t;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp314_ + ((_tmp315_ * (_tmp316_ - _tmp317_)) * (_tmp318_ - _tmp319_));
-#line 2583 "page-view.c"
+#line 2437 "page-view.c"
 	}
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp321_ = r;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp322_ = R;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp321_ != ((gdouble) _tmp322_)) {
-#line 2591 "page-view.c"
-		gdouble _tmp323_;
-		gint _tmp324_;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2445 "page-view.c"
+		gdouble _tmp323_ = 0.0;
+		gint _tmp324_ = 0;
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp323_ = t;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp324_ = T;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp320_ = _tmp323_ != ((gdouble) _tmp324_);
-#line 2600 "page-view.c"
+#line 2454 "page-view.c"
 	} else {
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp320_ = FALSE;
-#line 2604 "page-view.c"
+#line 2458 "page-view.c"
 	}
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp325_ = _tmp320_;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp325_) {
-#line 2610 "page-view.c"
+#line 2464 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp326_;
-		gint _tmp327_;
-		gint _tmp328_;
-		gdouble _tmp329_;
-		guchar _tmp330_;
-		gdouble _tmp331_;
-		gint _tmp332_;
-		gint _tmp333_;
-		gdouble _tmp334_;
-		gdouble _tmp335_;
-		guchar _tmp336_;
-		gdouble _tmp337_;
-		gint _tmp338_;
-		gint _tmp339_;
-		gdouble _tmp340_;
-		gdouble _tmp341_;
-		guchar _tmp342_;
-		gdouble _tmp343_;
-		gint _tmp344_;
-		gint _tmp345_;
-		gdouble _tmp346_;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		Page* _tmp326_ = NULL;
+		gint _tmp327_ = 0;
+		gint _tmp328_ = 0;
+		gdouble _tmp329_ = 0.0;
+		guchar _tmp330_ = '\0';
+		gdouble _tmp331_ = 0.0;
+		gint _tmp332_ = 0;
+		gint _tmp333_ = 0;
+		gdouble _tmp334_ = 0.0;
+		gdouble _tmp335_ = 0.0;
+		guchar _tmp336_ = '\0';
+		gdouble _tmp337_ = 0.0;
+		gint _tmp338_ = 0;
+		gint _tmp339_ = 0;
+		gdouble _tmp340_ = 0.0;
+		gdouble _tmp341_ = 0.0;
+		guchar _tmp342_ = '\0';
+		gdouble _tmp343_ = 0.0;
+		gint _tmp344_ = 0;
+		gint _tmp345_ = 0;
+		gdouble _tmp346_ = 0.0;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp326_ = page;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp327_ = R;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp328_ = T;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp326_, _tmp327_, _tmp328_ - 1, p, 3);
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp329_ = red;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp330_ = p[0];
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp331_ = r;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp332_ = R;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp333_ = T;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp334_ = t;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp329_ + ((_tmp330_ * (_tmp331_ - _tmp332_)) * (_tmp333_ - _tmp334_));
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp335_ = green;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp336_ = p[1];
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp337_ = r;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp338_ = R;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp339_ = T;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp340_ = t;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp335_ + ((_tmp336_ * (_tmp337_ - _tmp338_)) * (_tmp339_ - _tmp340_));
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp341_ = blue;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp342_ = p[2];
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp343_ = r;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp344_ = R;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp345_ = T;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp346_ = t;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp341_ + ((_tmp342_ * (_tmp343_ - _tmp344_)) * (_tmp345_ - _tmp346_));
-#line 2683 "page-view.c"
+#line 2537 "page-view.c"
 	}
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp348_ = r;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp349_ = R;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp348_ != ((gdouble) _tmp349_)) {
-#line 2691 "page-view.c"
-		gdouble _tmp350_;
-		gint _tmp351_;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2545 "page-view.c"
+		gdouble _tmp350_ = 0.0;
+		gint _tmp351_ = 0;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp350_ = b;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp351_ = B;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp347_ = _tmp350_ != ((gdouble) _tmp351_);
-#line 2700 "page-view.c"
+#line 2554 "page-view.c"
 	} else {
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp347_ = FALSE;
-#line 2704 "page-view.c"
+#line 2558 "page-view.c"
 	}
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp352_ = _tmp347_;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp352_) {
-#line 2710 "page-view.c"
+#line 2564 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp353_;
-		gint _tmp354_;
-		gint _tmp355_;
-		gdouble _tmp356_;
-		guchar _tmp357_;
-		gdouble _tmp358_;
-		gint _tmp359_;
-		gdouble _tmp360_;
-		gint _tmp361_;
-		gdouble _tmp362_;
-		guchar _tmp363_;
-		gdouble _tmp364_;
-		gint _tmp365_;
-		gdouble _tmp366_;
-		gint _tmp367_;
-		gdouble _tmp368_;
-		guchar _tmp369_;
-		gdouble _tmp370_;
-		gint _tmp371_;
-		gdouble _tmp372_;
-		gint _tmp373_;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		Page* _tmp353_ = NULL;
+		gint _tmp354_ = 0;
+		gint _tmp355_ = 0;
+		gdouble _tmp356_ = 0.0;
+		guchar _tmp357_ = '\0';
+		gdouble _tmp358_ = 0.0;
+		gint _tmp359_ = 0;
+		gdouble _tmp360_ = 0.0;
+		gint _tmp361_ = 0;
+		gdouble _tmp362_ = 0.0;
+		guchar _tmp363_ = '\0';
+		gdouble _tmp364_ = 0.0;
+		gint _tmp365_ = 0;
+		gdouble _tmp366_ = 0.0;
+		gint _tmp367_ = 0;
+		gdouble _tmp368_ = 0.0;
+		guchar _tmp369_ = '\0';
+		gdouble _tmp370_ = 0.0;
+		gint _tmp371_ = 0;
+		gdouble _tmp372_ = 0.0;
+		gint _tmp373_ = 0;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp353_ = page;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp354_ = R;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp355_ = B;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp353_, _tmp354_, _tmp355_, p, 3);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp356_ = red;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp357_ = p[0];
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp358_ = r;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp359_ = R;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp360_ = b;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp361_ = B;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp356_ + ((_tmp357_ * (_tmp358_ - _tmp359_)) * (_tmp360_ - _tmp361_));
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp362_ = green;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp363_ = p[1];
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp364_ = r;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp365_ = R;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp366_ = b;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp367_ = B;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp362_ + ((_tmp363_ * (_tmp364_ - _tmp365_)) * (_tmp366_ - _tmp367_));
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp368_ = blue;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp369_ = p[2];
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp370_ = r;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp371_ = R;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp372_ = b;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp373_ = B;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp368_ + ((_tmp369_ * (_tmp370_ - _tmp371_)) * (_tmp372_ - _tmp373_));
-#line 2783 "page-view.c"
+#line 2637 "page-view.c"
 	}
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp375_ = l;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp376_ = L;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp375_ != ((gdouble) _tmp376_)) {
-#line 2791 "page-view.c"
-		gdouble _tmp377_;
-		gint _tmp378_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 2645 "page-view.c"
+		gdouble _tmp377_ = 0.0;
+		gint _tmp378_ = 0;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp377_ = b;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp378_ = B;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp374_ = _tmp377_ != ((gdouble) _tmp378_);
-#line 2800 "page-view.c"
+#line 2654 "page-view.c"
 	} else {
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp374_ = FALSE;
-#line 2804 "page-view.c"
+#line 2658 "page-view.c"
 	}
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp379_ = _tmp374_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp379_) {
-#line 2810 "page-view.c"
+#line 2664 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp380_;
-		gint _tmp381_;
-		gint _tmp382_;
-		gdouble _tmp383_;
-		guchar _tmp384_;
-		gint _tmp385_;
-		gdouble _tmp386_;
-		gdouble _tmp387_;
-		gint _tmp388_;
-		gdouble _tmp389_;
-		guchar _tmp390_;
-		gint _tmp391_;
-		gdouble _tmp392_;
-		gdouble _tmp393_;
-		gint _tmp394_;
-		gdouble _tmp395_;
-		guchar _tmp396_;
-		gint _tmp397_;
-		gdouble _tmp398_;
-		gdouble _tmp399_;
-		gint _tmp400_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		Page* _tmp380_ = NULL;
+		gint _tmp381_ = 0;
+		gint _tmp382_ = 0;
+		gdouble _tmp383_ = 0.0;
+		guchar _tmp384_ = '\0';
+		gint _tmp385_ = 0;
+		gdouble _tmp386_ = 0.0;
+		gdouble _tmp387_ = 0.0;
+		gint _tmp388_ = 0;
+		gdouble _tmp389_ = 0.0;
+		guchar _tmp390_ = '\0';
+		gint _tmp391_ = 0;
+		gdouble _tmp392_ = 0.0;
+		gdouble _tmp393_ = 0.0;
+		gint _tmp394_ = 0;
+		gdouble _tmp395_ = 0.0;
+		guchar _tmp396_ = '\0';
+		gint _tmp397_ = 0;
+		gdouble _tmp398_ = 0.0;
+		gdouble _tmp399_ = 0.0;
+		gint _tmp400_ = 0;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp380_ = page;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp381_ = L;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp382_ = B;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp380_, _tmp381_ - 1, _tmp382_, p, 3);
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp383_ = red;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp384_ = p[0];
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp385_ = L;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp386_ = l;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp387_ = b;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp388_ = B;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp383_ + ((_tmp384_ * (_tmp385_ - _tmp386_)) * (_tmp387_ - _tmp388_));
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp389_ = green;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp390_ = p[1];
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp391_ = L;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp392_ = l;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp393_ = b;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp394_ = B;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp389_ + ((_tmp390_ * (_tmp391_ - _tmp392_)) * (_tmp393_ - _tmp394_));
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp395_ = blue;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp396_ = p[2];
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp397_ = L;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp398_ = l;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp399_ = b;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp400_ = B;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp395_ + ((_tmp396_ * (_tmp397_ - _tmp398_)) * (_tmp399_ - _tmp400_));
-#line 2883 "page-view.c"
+#line 2737 "page-view.c"
 	}
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp401_ = r;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp402_ = l;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp403_ = b;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp404_ = t;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	scale = 1.0 / ((_tmp401_ - _tmp402_) * (_tmp403_ - _tmp404_));
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405_ = output;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405__length1 = output_length1;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp406_ = offset;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp407_ = red;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp408_ = scale;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405_[_tmp406_] = (guchar) ((_tmp407_ * _tmp408_) + 0.5);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp409_ = _tmp405_[_tmp406_];
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp410_ = output;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp410__length1 = output_length1;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp411_ = offset;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp412_ = green;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp413_ = scale;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp410_[_tmp411_ + 1] = (guchar) ((_tmp412_ * _tmp413_) + 0.5);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp414_ = _tmp410_[_tmp411_ + 1];
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp415_ = output;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp415__length1 = output_length1;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp416_ = offset;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp417_ = blue;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp418_ = scale;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp415_[_tmp416_ + 2] = (guchar) ((_tmp417_ * _tmp418_) + 0.5);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp419_ = _tmp415_[_tmp416_ + 2];
-#line 2937 "page-view.c"
+#line 2791 "page-view.c"
 }
 
 
 static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** output_image, gint output_width, gint output_height, ScanDirection scan_direction, gint old_scan_line, gint scan_line) {
-	Page* _tmp0_;
+	gint input_width = 0;
+	Page* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-	gint input_width;
-	Page* _tmp2_;
-	gint _tmp3_ = 0;
-	gint input_height;
+	gint _tmp2_ = 0;
+	gint input_height = 0;
+	Page* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
 	gint L = 0;
 	gint R = 0;
 	gint T = 0;
 	gint B = 0;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	GdkPixbuf* _tmp6_;
-	gboolean _tmp10_;
-	gboolean _tmp14_;
-	gint _tmp56_;
-	gint _tmp57_;
-	gint _tmp59_;
-	gint _tmp60_;
-	gint _tmp62_;
-	gint _tmp63_;
-	gint _tmp64_;
-	gint _tmp65_;
-	gint _tmp66_;
-	gint _tmp67_;
-	GdkPixbuf* _tmp68_;
-	GdkPixbuf* _tmp69_;
-	guint8* _tmp70_ = NULL;
-	guchar* output;
-	gint output_length1;
-	gint _output_size_;
-	GdkPixbuf* _tmp71_;
-	gint _tmp72_ = 0;
-	gint output_rowstride;
-	GdkPixbuf* _tmp73_;
-	gint _tmp74_ = 0;
-	gint output_n_channels;
-	Page* _tmp75_;
-	gboolean _tmp76_ = FALSE;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+	GdkPixbuf* _tmp8_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	gboolean _tmp18_ = FALSE;
+	gint _tmp60_ = 0;
+	gint _tmp61_ = 0;
+	gint _tmp63_ = 0;
+	gint _tmp64_ = 0;
+	gint _tmp66_ = 0;
+	gint _tmp67_ = 0;
+	gint _tmp68_ = 0;
+	gint _tmp69_ = 0;
+	gint _tmp70_ = 0;
+	gint _tmp71_ = 0;
+	GdkPixbuf* _tmp72_ = NULL;
+	guchar* output = NULL;
+	GdkPixbuf* _tmp73_ = NULL;
+	guint8* _tmp74_ = NULL;
+	gint output_length1 = 0;
+	gint _output_size_ = 0;
+	gint output_rowstride = 0;
+	GdkPixbuf* _tmp75_ = NULL;
+	gint _tmp76_ = 0;
+	gint _tmp77_ = 0;
+	gint output_n_channels = 0;
+	GdkPixbuf* _tmp78_ = NULL;
+	gint _tmp79_ = 0;
+	Page* _tmp80_ = NULL;
+	gboolean _tmp81_ = FALSE;
+	gboolean _tmp82_ = FALSE;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	input_width = _tmp1_;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page_get_height (_tmp2_);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	input_height = _tmp3_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = *output_image;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp6_ == NULL) {
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = TRUE;
-#line 3003 "page-view.c"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = _tmp1_;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	input_width = _tmp2_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = page;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = page_get_height (_tmp3_);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = _tmp4_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	input_height = _tmp5_;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = *output_image;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp8_ == NULL) {
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = TRUE;
+#line 2865 "page-view.c"
 	} else {
-		GdkPixbuf* _tmp7_;
-		gint _tmp8_ = 0;
-		gint _tmp9_;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = *output_image;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = gdk_pixbuf_get_width (_tmp7_);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = output_width;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = _tmp8_ != _tmp9_;
-#line 3016 "page-view.c"
+		GdkPixbuf* _tmp9_ = NULL;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+		gint _tmp12_ = 0;
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp9_ = *output_image;
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp10_ = gdk_pixbuf_get_width (_tmp9_);
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = _tmp10_;
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp12_ = output_width;
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = _tmp11_ != _tmp12_;
+#line 2881 "page-view.c"
 	}
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = _tmp5_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_) {
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp4_ = TRUE;
-#line 3024 "page-view.c"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = _tmp7_;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp13_) {
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp6_ = TRUE;
+#line 2889 "page-view.c"
 	} else {
-		GdkPixbuf* _tmp11_;
-		gint _tmp12_ = 0;
-		gint _tmp13_;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = *output_image;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp12_ = gdk_pixbuf_get_height (_tmp11_);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp13_ = output_height;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp4_ = _tmp12_ != _tmp13_;
-#line 3037 "page-view.c"
+		GdkPixbuf* _tmp14_ = NULL;
+		gint _tmp15_ = 0;
+		gint _tmp16_ = 0;
+		gint _tmp17_ = 0;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp14_ = *output_image;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp15_ = gdk_pixbuf_get_height (_tmp14_);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp16_ = _tmp15_;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp17_ = output_height;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp6_ = _tmp16_ != _tmp17_;
+#line 2905 "page-view.c"
 	}
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = _tmp4_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp14_) {
-#line 3043 "page-view.c"
-		gint _tmp15_;
-		gint _tmp16_;
-		GdkPixbuf* _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp15_ = output_width;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp16_ = output_height;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp17_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp15_, _tmp16_);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp18_ = _tmp6_;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp18_) {
+#line 2911 "page-view.c"
+		gint _tmp19_ = 0;
+		gint _tmp20_ = 0;
+		GdkPixbuf* _tmp21_ = NULL;
+		gint _tmp22_ = 0;
+		gint _tmp23_ = 0;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp19_ = output_width;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp20_ = output_height;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp21_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp19_, _tmp20_);
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (*output_image);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		*output_image = _tmp17_;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		*output_image = _tmp21_;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = 0;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp18_ = output_width;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		R = _tmp18_ - 1;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp22_ = output_width;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		R = _tmp22_ - 1;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = 0;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp19_ = output_height;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		B = _tmp19_ - 1;
-#line 3071 "page-view.c"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp23_ = output_height;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		B = _tmp23_ - 1;
+#line 2939 "page-view.c"
 	} else {
-		ScanDirection _tmp20_;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp20_ = scan_direction;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		switch (_tmp20_) {
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		ScanDirection _tmp24_ = 0;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp24_ = scan_direction;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		switch (_tmp24_) {
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 3080 "page-view.c"
+#line 2948 "page-view.c"
 			{
-				gint _tmp21_;
-				gint _tmp22_;
-				gint _tmp23_;
-				gint _tmp24_;
-				gint _tmp25_;
-				gint _tmp26_;
-				gint _tmp27_;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint _tmp25_ = 0;
+				gint _tmp26_ = 0;
+				gint _tmp27_ = 0;
+				gint _tmp28_ = 0;
+				gint _tmp29_ = 0;
+				gint _tmp30_ = 0;
+				gint _tmp31_ = 0;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp21_ = output_width;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp21_ - 1;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp22_ = old_scan_line;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp23_ = output_height;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp24_ = input_height;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = (gint) ((((gdouble) _tmp22_) * _tmp23_) / _tmp24_);
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp25_ = scan_line;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp26_ = output_height;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp27_ = input_height;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = (gint) (((((gdouble) _tmp25_) * _tmp26_) / _tmp27_) + 0.5);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp25_ = output_width;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				R = _tmp25_ - 1;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp26_ = old_scan_line;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp27_ = output_height;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp28_ = input_height;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				T = (gint) ((((gdouble) _tmp26_) * _tmp27_) / _tmp28_);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp29_ = scan_line;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp30_ = output_height;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp31_ = input_height;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				B = (gint) (((((gdouble) _tmp29_) * _tmp30_) / _tmp31_) + 0.5);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3113 "page-view.c"
+#line 2981 "page-view.c"
 			}
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 3117 "page-view.c"
+#line 2985 "page-view.c"
 			{
-				gint _tmp28_;
-				gint _tmp29_;
-				gint _tmp30_;
-				gint _tmp31_;
-				gint _tmp32_;
-				gint _tmp33_;
-				gint _tmp34_;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp28_ = old_scan_line;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp29_ = output_width;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp30_ = input_width;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = (gint) ((((gdouble) _tmp28_) * _tmp29_) / _tmp30_);
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp31_ = scan_line;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp32_ = output_width;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp33_ = input_width;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp33_) + 0.5);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint _tmp32_ = 0;
+				gint _tmp33_ = 0;
+				gint _tmp34_ = 0;
+				gint _tmp35_ = 0;
+				gint _tmp36_ = 0;
+				gint _tmp37_ = 0;
+				gint _tmp38_ = 0;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp32_ = old_scan_line;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp33_ = output_width;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp34_ = input_width;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				L = (gint) ((((gdouble) _tmp32_) * _tmp33_) / _tmp34_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp35_ = scan_line;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp36_ = output_width;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp37_ = input_width;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				R = (gint) (((((gdouble) _tmp35_) * _tmp36_) / _tmp37_) + 0.5);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp34_ = output_height;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp34_ - 1;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp38_ = output_height;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				B = _tmp38_ - 1;
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3150 "page-view.c"
+#line 3018 "page-view.c"
 			}
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 3154 "page-view.c"
+#line 3022 "page-view.c"
 			{
-				gint _tmp35_;
-				gint _tmp36_;
-				gint _tmp37_;
-				gint _tmp38_;
-				gint _tmp39_;
-				gint _tmp40_;
-				gint _tmp41_;
-				gint _tmp42_;
-				gint _tmp43_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint _tmp39_ = 0;
+				gint _tmp40_ = 0;
+				gint _tmp41_ = 0;
+				gint _tmp42_ = 0;
+				gint _tmp43_ = 0;
+				gint _tmp44_ = 0;
+				gint _tmp45_ = 0;
+				gint _tmp46_ = 0;
+				gint _tmp47_ = 0;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp35_ = output_width;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp35_ - 1;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp36_ = input_height;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp37_ = scan_line;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp38_ = output_height;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp39_ = input_height;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = (gint) ((((gdouble) (_tmp36_ - _tmp37_)) * _tmp38_) / _tmp39_);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp39_ = output_width;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				R = _tmp39_ - 1;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp40_ = input_height;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp41_ = old_scan_line;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp41_ = scan_line;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp42_ = output_height;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp43_ = input_height;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = (gint) (((((gdouble) (_tmp40_ - _tmp41_)) * _tmp42_) / _tmp43_) + 0.5);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				T = (gint) ((((gdouble) (_tmp40_ - _tmp41_)) * _tmp42_) / _tmp43_);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp44_ = input_height;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp45_ = old_scan_line;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp46_ = output_height;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp47_ = input_height;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				B = (gint) (((((gdouble) (_tmp44_ - _tmp45_)) * _tmp46_) / _tmp47_) + 0.5);
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3193 "page-view.c"
+#line 3061 "page-view.c"
 			}
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 3197 "page-view.c"
+#line 3065 "page-view.c"
 			{
-				gint _tmp44_;
-				gint _tmp45_;
-				gint _tmp46_;
-				gint _tmp47_;
-				gint _tmp48_;
-				gint _tmp49_;
-				gint _tmp50_;
-				gint _tmp51_;
-				gint _tmp52_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp44_ = input_width;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp45_ = scan_line;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp46_ = output_width;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp47_ = input_width;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = (gint) ((((gdouble) (_tmp44_ - _tmp45_)) * _tmp46_) / _tmp47_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint _tmp48_ = 0;
+				gint _tmp49_ = 0;
+				gint _tmp50_ = 0;
+				gint _tmp51_ = 0;
+				gint _tmp52_ = 0;
+				gint _tmp53_ = 0;
+				gint _tmp54_ = 0;
+				gint _tmp55_ = 0;
+				gint _tmp56_ = 0;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp48_ = input_width;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp49_ = old_scan_line;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp49_ = scan_line;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp50_ = output_width;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp51_ = input_width;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = (gint) (((((gdouble) (_tmp48_ - _tmp49_)) * _tmp50_) / _tmp51_) + 0.5);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				L = (gint) ((((gdouble) (_tmp48_ - _tmp49_)) * _tmp50_) / _tmp51_);
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp52_ = input_width;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp53_ = old_scan_line;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp54_ = output_width;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp55_ = input_width;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				R = (gint) (((((gdouble) (_tmp52_ - _tmp53_)) * _tmp54_) / _tmp55_) + 0.5);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp52_ = output_height;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp52_ - 1;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp56_ = output_height;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				B = _tmp56_ - 1;
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3236 "page-view.c"
+#line 3104 "page-view.c"
 			}
 			default:
 			{
-				gint _tmp53_;
-				gint _tmp54_;
-				gint _tmp55_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gint _tmp57_ = 0;
+				gint _tmp58_ = 0;
+				gint _tmp59_ = 0;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp53_ = T;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp53_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp54_ = B;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp54_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp55_ = R;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = _tmp55_;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp57_ = T;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				B = _tmp57_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp58_ = B;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				R = _tmp58_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp59_ = R;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				L = _tmp59_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3259 "page-view.c"
+#line 3127 "page-view.c"
 			}
 		}
 	}
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp56_ = R;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp57_ = output_width;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp56_ >= _tmp57_) {
-#line 3269 "page-view.c"
-		gint _tmp58_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp58_ = output_width;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		R = _tmp58_ - 1;
-#line 3275 "page-view.c"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp60_ = R;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp61_ = output_width;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp60_ >= _tmp61_) {
+#line 3137 "page-view.c"
+		gint _tmp62_ = 0;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp62_ = output_width;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		R = _tmp62_ - 1;
+#line 3143 "page-view.c"
 	}
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp59_ = B;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp60_ = output_height;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp59_ >= _tmp60_) {
-#line 3283 "page-view.c"
-		gint _tmp61_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp61_ = output_height;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		B = _tmp61_ - 1;
-#line 3289 "page-view.c"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp63_ = B;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp64_ = output_height;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp63_ >= _tmp64_) {
+#line 3151 "page-view.c"
+		gint _tmp65_ = 0;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp65_ = output_height;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		B = _tmp65_ - 1;
+#line 3157 "page-view.c"
 	}
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp62_ = L;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp62_ >= 0);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp63_ = R;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp64_ = output_width;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp63_ < _tmp64_);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp65_ = T;
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp65_ >= 0);
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp66_ = B;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp67_ = output_height;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp66_ < _tmp67_);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp68_ = *output_image;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp68_ != NULL);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp69_ = *output_image;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp70_ = gdk_pixbuf_get_pixels (_tmp69_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output = _tmp70_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp66_ = L;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (_tmp66_ >= 0);
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp67_ = R;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp68_ = output_width;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (_tmp67_ < _tmp68_);
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp69_ = T;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (_tmp69_ >= 0);
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp70_ = B;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp71_ = output_height;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (_tmp70_ < _tmp71_);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp72_ = *output_image;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (_tmp72_ != NULL);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp73_ = *output_image;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp74_ = gdk_pixbuf_get_pixels (_tmp73_);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	output = _tmp74_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_length1 = -1;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_output_size_ = output_length1;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = *output_image;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = gdk_pixbuf_get_rowstride (_tmp71_);
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_rowstride = _tmp72_;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = *output_image;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = gdk_pixbuf_get_n_channels (_tmp73_);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_n_channels = _tmp74_;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = page;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp76_ = page_has_data (_tmp75_);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (!_tmp76_) {
-#line 3343 "page-view.c"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp75_ = *output_image;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp76_ = gdk_pixbuf_get_rowstride (_tmp75_);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp77_ = _tmp76_;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	output_rowstride = _tmp77_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp78_ = *output_image;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp79_ = gdk_pixbuf_get_n_channels (_tmp78_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	output_n_channels = _tmp79_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp80_ = page;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp81_ = page_get_has_data (_tmp80_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp82_ = _tmp81_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (!_tmp82_) {
+#line 3215 "page-view.c"
 		{
-			gint _tmp77_;
-			gint x;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp77_ = L;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = _tmp77_;
-#line 3351 "page-view.c"
+			gint x = 0;
+			gint _tmp83_ = 0;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp83_ = L;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			x = _tmp83_;
+#line 3223 "page-view.c"
 			{
-				gboolean _tmp78_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp78_ = TRUE;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gboolean _tmp84_ = FALSE;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp84_ = TRUE;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
-#line 3358 "page-view.c"
-					gboolean _tmp79_;
-					gint _tmp81_;
-					gint _tmp82_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp79_ = _tmp78_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!_tmp79_) {
-#line 3366 "page-view.c"
-						gint _tmp80_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp80_ = x;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						x = _tmp80_ + 1;
-#line 3372 "page-view.c"
+#line 3230 "page-view.c"
+					gboolean _tmp85_ = FALSE;
+					gint _tmp87_ = 0;
+					gint _tmp88_ = 0;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp85_ = _tmp84_;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					if (!_tmp85_) {
+#line 3238 "page-view.c"
+						gint _tmp86_ = 0;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp86_ = x;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						x = _tmp86_ + 1;
+#line 3244 "page-view.c"
 					}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp78_ = FALSE;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp81_ = x;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp82_ = R;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!(_tmp81_ <= _tmp82_)) {
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp84_ = FALSE;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp87_ = x;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp88_ = R;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					if (!(_tmp87_ <= _tmp88_)) {
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
-#line 3384 "page-view.c"
+#line 3256 "page-view.c"
 					}
 					{
-						gint _tmp83_;
-						gint y;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp83_ = T;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						y = _tmp83_;
-#line 3393 "page-view.c"
+						gint y = 0;
+						gint _tmp89_ = 0;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp89_ = T;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						y = _tmp89_;
+#line 3265 "page-view.c"
 						{
-							gboolean _tmp84_;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp84_ = TRUE;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							gboolean _tmp90_ = FALSE;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp90_ = TRUE;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							while (TRUE) {
-#line 3400 "page-view.c"
-								gboolean _tmp85_;
-								gint _tmp87_;
-								gint _tmp88_;
-								gint _tmp89_;
-								gint _tmp90_;
-								gint _tmp91_;
-								gint _tmp92_;
-								gint o;
-								guchar* _tmp93_;
-								gint _tmp93__length1;
-								gint _tmp94_;
-								guchar* _tmp95_;
-								gint _tmp95__length1;
-								gint _tmp96_;
-								guchar* _tmp97_;
-								gint _tmp97__length1;
-								gint _tmp98_;
-								guchar _tmp99_;
-								guchar _tmp100_;
-								guchar _tmp101_;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp85_ = _tmp84_;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								if (!_tmp85_) {
-#line 3425 "page-view.c"
-									gint _tmp86_;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									_tmp86_ = y;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									y = _tmp86_ + 1;
-#line 3431 "page-view.c"
+#line 3272 "page-view.c"
+								gboolean _tmp91_ = FALSE;
+								gint _tmp93_ = 0;
+								gint _tmp94_ = 0;
+								gint o = 0;
+								gint _tmp95_ = 0;
+								gint _tmp96_ = 0;
+								gint _tmp97_ = 0;
+								gint _tmp98_ = 0;
+								guchar* _tmp99_ = NULL;
+								gint _tmp99__length1 = 0;
+								gint _tmp100_ = 0;
+								guchar* _tmp101_ = NULL;
+								gint _tmp101__length1 = 0;
+								gint _tmp102_ = 0;
+								guchar* _tmp103_ = NULL;
+								gint _tmp103__length1 = 0;
+								gint _tmp104_ = 0;
+								guchar _tmp105_ = '\0';
+								guchar _tmp106_ = '\0';
+								guchar _tmp107_ = '\0';
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp91_ = _tmp90_;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								if (!_tmp91_) {
+#line 3297 "page-view.c"
+									gint _tmp92_ = 0;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+									_tmp92_ = y;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+									y = _tmp92_ + 1;
+#line 3303 "page-view.c"
 								}
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp84_ = FALSE;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp87_ = y;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp88_ = B;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								if (!(_tmp87_ <= _tmp88_)) {
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp90_ = FALSE;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp93_ = y;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp94_ = B;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								if (!(_tmp93_ <= _tmp94_)) {
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									break;
-#line 3443 "page-view.c"
+#line 3315 "page-view.c"
 								}
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp89_ = output_rowstride;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp90_ = y;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp91_ = x;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp92_ = output_n_channels;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								o = (_tmp89_ * _tmp90_) + (_tmp91_ * _tmp92_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp93_ = output;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp93__length1 = output_length1;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp94_ = o;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp95_ = output;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp95__length1 = output_length1;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp96_ = o;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp97_ = output;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp97__length1 = output_length1;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp98_ = o;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp97_[_tmp98_ + 2] = (guchar) 0xFF;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp99_ = _tmp97_[_tmp98_ + 2];
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp95_[_tmp96_ + 1] = _tmp99_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp100_ = _tmp95_[_tmp96_ + 1];
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp93_[_tmp94_] = _tmp100_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp101_ = _tmp93_[_tmp94_];
-#line 3485 "page-view.c"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp95_ = output_rowstride;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp96_ = y;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp97_ = x;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp98_ = output_n_channels;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								o = (_tmp95_ * _tmp96_) + (_tmp97_ * _tmp98_);
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp99_ = output;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp99__length1 = output_length1;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp100_ = o;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp101_ = output;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp101__length1 = output_length1;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp102_ = o;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp103_ = output;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp103__length1 = output_length1;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp104_ = o;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp103_[_tmp104_ + 2] = (guchar) 0xFF;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp105_ = _tmp103_[_tmp104_ + 2];
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp101_[_tmp102_ + 1] = _tmp105_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp106_ = _tmp101_[_tmp102_ + 1];
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp99_[_tmp100_] = _tmp106_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp107_ = _tmp99_[_tmp100_];
+#line 3357 "page-view.c"
 							}
 						}
 					}
 				}
 			}
 		}
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 3494 "page-view.c"
+#line 3366 "page-view.c"
 	}
 	{
-		gint _tmp102_;
-		gint x;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp102_ = L;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp102_;
-#line 3503 "page-view.c"
+		gint x = 0;
+		gint _tmp108_ = 0;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp108_ = L;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		x = _tmp108_;
+#line 3375 "page-view.c"
 		{
-			gboolean _tmp103_;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp103_ = TRUE;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			gboolean _tmp109_ = FALSE;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp109_ = TRUE;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 3510 "page-view.c"
-				gboolean _tmp104_;
-				gint _tmp106_;
-				gint _tmp107_;
-				gint _tmp108_;
-				gint _tmp109_;
-				gint _tmp110_;
-				gdouble l;
-				gint _tmp111_;
-				gint _tmp112_;
-				gint _tmp113_;
-				gdouble r;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp104_ = _tmp103_;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp104_) {
-#line 3526 "page-view.c"
-					gint _tmp105_;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp105_ = x;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp105_ + 1;
-#line 3532 "page-view.c"
+#line 3382 "page-view.c"
+				gboolean _tmp110_ = FALSE;
+				gint _tmp112_ = 0;
+				gint _tmp113_ = 0;
+				gdouble l = 0.0;
+				gint _tmp114_ = 0;
+				gint _tmp115_ = 0;
+				gint _tmp116_ = 0;
+				gdouble r = 0.0;
+				gint _tmp117_ = 0;
+				gint _tmp118_ = 0;
+				gint _tmp119_ = 0;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp110_ = _tmp109_;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				if (!_tmp110_) {
+#line 3398 "page-view.c"
+					gint _tmp111_ = 0;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp111_ = x;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					x = _tmp111_ + 1;
+#line 3404 "page-view.c"
 				}
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp103_ = FALSE;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp106_ = x;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp107_ = R;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp106_ <= _tmp107_)) {
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp109_ = FALSE;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp112_ = x;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp113_ = R;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				if (!(_tmp112_ <= _tmp113_)) {
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 3544 "page-view.c"
+#line 3416 "page-view.c"
 				}
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp108_ = x;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp109_ = input_width;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp110_ = output_width;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				l = (((gdouble) _tmp108_) * _tmp109_) / _tmp110_;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp111_ = x;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp112_ = input_width;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp113_ = output_width;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				r = (((gdouble) (_tmp111_ + 1)) * _tmp112_) / _tmp113_;
-#line 3562 "page-view.c"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp114_ = x;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp115_ = input_width;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp116_ = output_width;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				l = (((gdouble) _tmp114_) * _tmp115_) / _tmp116_;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp117_ = x;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp118_ = input_width;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp119_ = output_width;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				r = (((gdouble) (_tmp117_ + 1)) * _tmp118_) / _tmp119_;
+#line 3434 "page-view.c"
 				{
-					gint _tmp114_;
-					gint y;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp114_ = T;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp114_;
-#line 3570 "page-view.c"
+					gint y = 0;
+					gint _tmp120_ = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp120_ = T;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					y = _tmp120_;
+#line 3442 "page-view.c"
 					{
-						gboolean _tmp115_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp115_ = TRUE;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						gboolean _tmp121_ = FALSE;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp121_ = TRUE;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
-#line 3577 "page-view.c"
-							gboolean _tmp116_;
-							gint _tmp118_;
-							gint _tmp119_;
-							gint _tmp120_;
-							gint _tmp121_;
-							gint _tmp122_;
-							gdouble t;
-							gint _tmp123_;
-							gint _tmp124_;
-							gint _tmp125_;
-							gdouble b;
-							Page* _tmp126_;
-							gdouble _tmp127_;
-							gdouble _tmp128_;
-							gdouble _tmp129_;
-							gdouble _tmp130_;
-							guchar* _tmp131_;
-							gint _tmp131__length1;
-							gint _tmp132_;
-							gint _tmp133_;
-							gint _tmp134_;
-							gint _tmp135_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp116_ = _tmp115_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!_tmp116_) {
-#line 3604 "page-view.c"
-								gint _tmp117_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp117_ = y;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								y = _tmp117_ + 1;
-#line 3610 "page-view.c"
+#line 3449 "page-view.c"
+							gboolean _tmp122_ = FALSE;
+							gint _tmp124_ = 0;
+							gint _tmp125_ = 0;
+							gdouble t = 0.0;
+							gint _tmp126_ = 0;
+							gint _tmp127_ = 0;
+							gint _tmp128_ = 0;
+							gdouble b = 0.0;
+							gint _tmp129_ = 0;
+							gint _tmp130_ = 0;
+							gint _tmp131_ = 0;
+							Page* _tmp132_ = NULL;
+							gdouble _tmp133_ = 0.0;
+							gdouble _tmp134_ = 0.0;
+							gdouble _tmp135_ = 0.0;
+							gdouble _tmp136_ = 0.0;
+							guchar* _tmp137_ = NULL;
+							gint _tmp137__length1 = 0;
+							gint _tmp138_ = 0;
+							gint _tmp139_ = 0;
+							gint _tmp140_ = 0;
+							gint _tmp141_ = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp122_ = _tmp121_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							if (!_tmp122_) {
+#line 3476 "page-view.c"
+								gint _tmp123_ = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								_tmp123_ = y;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+								y = _tmp123_ + 1;
+#line 3482 "page-view.c"
 							}
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp115_ = FALSE;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp118_ = y;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp119_ = B;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!(_tmp118_ <= _tmp119_)) {
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp121_ = FALSE;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp124_ = y;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp125_ = B;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							if (!(_tmp124_ <= _tmp125_)) {
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
-#line 3622 "page-view.c"
+#line 3494 "page-view.c"
 							}
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp120_ = y;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp121_ = input_height;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp122_ = output_height;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							t = (((gdouble) _tmp120_) * _tmp121_) / _tmp122_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp123_ = y;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp124_ = input_height;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp125_ = output_height;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							b = (((gdouble) (_tmp123_ + 1)) * _tmp124_) / _tmp125_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp126_ = page;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp127_ = l;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp128_ = r;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp129_ = t;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp130_ = b;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp131_ = output;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp131__length1 = output_length1;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp132_ = output_rowstride;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp133_ = y;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp134_ = x;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp135_ = output_n_channels;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							page_view_set_pixel (self, _tmp126_, _tmp127_, _tmp128_, _tmp129_, _tmp130_, _tmp131_, _tmp131__length1, (_tmp132_ * _tmp133_) + (_tmp134_ * _tmp135_));
-#line 3664 "page-view.c"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp126_ = y;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp127_ = input_height;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp128_ = output_height;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							t = (((gdouble) _tmp126_) * _tmp127_) / _tmp128_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp129_ = y;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp130_ = input_height;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp131_ = output_height;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							b = (((gdouble) (_tmp129_ + 1)) * _tmp130_) / _tmp131_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp132_ = page;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp133_ = l;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp134_ = r;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp135_ = t;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp136_ = b;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp137_ = output;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp137__length1 = output_length1;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp138_ = output_rowstride;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp139_ = y;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp140_ = x;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							_tmp141_ = output_n_channels;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+							page_view_set_pixel (self, _tmp132_, _tmp133_, _tmp134_, _tmp135_, _tmp136_, _tmp137_, _tmp137__length1, (_tmp138_ * _tmp139_) + (_tmp140_ * _tmp141_));
+#line 3536 "page-view.c"
 						}
 					}
 				}
@@ -3672,1775 +3544,1856 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 
 static gint page_view_get_preview_width (PageView* self) {
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->width;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3688 "page-view.c"
+#line 3560 "page-view.c"
 }
 
 
 static gint page_view_get_preview_height (PageView* self) {
 	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->height;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3706 "page-view.c"
+#line 3578 "page-view.c"
 }
 
 
 static void page_view_update_page_view (PageView* self) {
-	gboolean _tmp0_;
-	gint _tmp1_;
-	gint old_scan_line;
-	Page* _tmp2_;
+	gboolean _tmp0_ = FALSE;
+	gint old_scan_line = 0;
+	gint _tmp1_ = 0;
+	gint scan_line = 0;
+	Page* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-	gint scan_line;
-	ScanDirection _tmp4_;
-	Page* _tmp5_;
-	ScanDirection _tmp6_ = 0;
-	ScanDirection left_steps;
-	gboolean _tmp7_ = FALSE;
-	ScanDirection _tmp8_;
-	gboolean _tmp10_;
-	Page* _tmp11_;
-	ScanDirection _tmp12_ = 0;
-	Page* _tmp13_;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	Page* _tmp16_;
-	ScanDirection _tmp17_ = 0;
-	gint _tmp18_;
-	gint _tmp19_;
-	gint _tmp20_;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp4_ = 0;
+	ScanDirection left_steps = 0;
+	ScanDirection _tmp5_ = 0;
+	Page* _tmp6_ = NULL;
+	ScanDirection _tmp7_ = 0;
+	ScanDirection _tmp8_ = 0;
+	gboolean _tmp9_ = FALSE;
+	ScanDirection _tmp10_ = 0;
+	gboolean _tmp12_ = FALSE;
+	Page* _tmp13_ = NULL;
+	ScanDirection _tmp14_ = 0;
+	ScanDirection _tmp15_ = 0;
+	Page* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	gint _tmp18_ = 0;
+	Page* _tmp19_ = NULL;
+	ScanDirection _tmp20_ = 0;
+	ScanDirection _tmp21_ = 0;
+	gint _tmp22_ = 0;
+	gint _tmp23_ = 0;
+	gint _tmp24_ = 0;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->update_image;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp0_) {
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 3742 "page-view.c"
+#line 3618 "page-view.c"
 	}
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->scan_line;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old_scan_line = _tmp1_;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->page;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = self->priv->_page;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_scan_line (_tmp2_);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	scan_line = _tmp3_;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->scan_direction;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = self->priv->page;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = page_get_scan_direction (_tmp5_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	left_steps = _tmp4_ - _tmp6_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = left_steps;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ != 0) {
-#line 3766 "page-view.c"
-		GdkPixbuf* _tmp9_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = self->priv->image;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = _tmp9_ != NULL;
-#line 3772 "page-view.c"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = _tmp3_;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	scan_line = _tmp4_;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = self->priv->scan_direction;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = self->priv->_page;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp7_ = page_get_scan_direction (_tmp6_);
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = _tmp7_;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	left_steps = _tmp5_ - _tmp8_;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp10_ = left_steps;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp10_ != 0) {
+#line 3646 "page-view.c"
+		GdkPixbuf* _tmp11_ = NULL;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = self->priv->image;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp9_ = _tmp11_ != NULL;
+#line 3652 "page-view.c"
 	} else {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = FALSE;
-#line 3776 "page-view.c"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp9_ = FALSE;
+#line 3656 "page-view.c"
 	}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = _tmp7_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_) {
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = _tmp9_;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp12_) {
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (self->priv->image);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->image = NULL;
-#line 3786 "page-view.c"
+#line 3666 "page-view.c"
 	}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = self->priv->page;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = page_get_scan_direction (_tmp11_);
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->scan_direction = _tmp12_;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = self->priv->page;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = page_view_get_preview_width (self);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = page_view_get_preview_height (self);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = self->priv->page;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = page_get_scan_direction (_tmp16_);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = old_scan_line;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = scan_line;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_update_preview (self, _tmp13_, &self->priv->image, _tmp14_, _tmp15_, _tmp17_, _tmp18_, _tmp19_);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = self->priv->_page;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp14_ = page_get_scan_direction (_tmp13_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp15_ = _tmp14_;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->scan_direction = _tmp15_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp16_ = self->priv->_page;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp17_ = page_view_get_preview_width (self);
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp18_ = page_view_get_preview_height (self);
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp19_ = self->priv->_page;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp20_ = page_get_scan_direction (_tmp19_);
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp21_ = _tmp20_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp22_ = old_scan_line;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp23_ = scan_line;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	page_view_update_preview (self, _tmp16_, &self->priv->image, _tmp17_, _tmp18_, _tmp21_, _tmp22_, _tmp23_);
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = FALSE;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = scan_line;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->scan_line = _tmp20_;
-#line 3816 "page-view.c"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp24_ = scan_line;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->scan_line = _tmp24_;
+#line 3700 "page-view.c"
 }
 
 
 static gint page_view_page_to_screen_x (PageView* self, gint x) {
 	gint result = 0;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-	Page* _tmp2_;
+	Page* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp4_ = 0;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_width (self);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->page;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = self->priv->_page;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_width (_tmp2_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp3_) + 0.5);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = _tmp3_;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3840 "page-view.c"
+#line 3727 "page-view.c"
 }
 
 
 static gint page_view_page_to_screen_y (PageView* self, gint y) {
 	gint result = 0;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-	Page* _tmp2_;
+	Page* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp4_ = 0;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = y;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_height (self);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->page;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = self->priv->_page;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_height (_tmp2_);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp3_) + 0.5);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = _tmp3_;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3864 "page-view.c"
+#line 3754 "page-view.c"
 }
 
 
 static gint page_view_screen_to_page_x (PageView* self, gint x) {
 	gint result = 0;
-	gint _tmp0_;
-	Page* _tmp1_;
+	gint _tmp0_ = 0;
+	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp4_ = 0;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->page;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_width (_tmp1_);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page_view_get_preview_width (self);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp2_) / _tmp3_) + 0.5);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = page_view_get_preview_width (self);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3888 "page-view.c"
+#line 3781 "page-view.c"
 }
 
 
 static gint page_view_screen_to_page_y (PageView* self, gint y) {
 	gint result = 0;
-	gint _tmp0_;
-	Page* _tmp1_;
+	gint _tmp0_ = 0;
+	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp4_ = 0;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = y;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->page;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_height (_tmp1_);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = page_view_get_preview_height (self);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = (gint) (((((gdouble) _tmp0_) * _tmp2_) / _tmp3_) + 0.5);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = page_view_get_preview_height (self);
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3912 "page-view.c"
+#line 3808 "page-view.c"
 }
 
 
 static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y) {
 	CropLocation result = 0;
-	Page* _tmp0_;
+	Page* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
 	gint cx = 0;
-	gint cy = 0;
-	gint cw = 0;
-	gint ch = 0;
-	Page* _tmp2_;
-	gint _tmp3_ = 0;
+	Page* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_;
+	gint cy = 0;
+	Page* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-	gint dx;
-	gint _tmp9_;
+	gint cw = 0;
+	Page* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-	gint dy;
-	gint _tmp11_;
-	gint _tmp12_ = 0;
-	gint dw;
-	gint _tmp13_;
+	gint _tmp11_ = 0;
+	gint ch = 0;
+	Page* _tmp12_ = NULL;
+	gint _tmp13_ = 0;
 	gint _tmp14_ = 0;
-	gint dh;
-	gint _tmp15_;
-	gint _tmp16_;
-	gint ix;
-	gint _tmp17_;
-	gint _tmp18_;
-	gint iy;
-	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
-	gint _tmp22_;
-	gboolean _tmp25_;
-	gboolean _tmp27_;
-	gboolean _tmp30_;
-	Page* _tmp31_;
-	gchar* _tmp32_ = NULL;
-	gchar* name;
-	const gchar* _tmp33_;
-	gint crop_border;
-	gint _tmp34_;
-	gint _tmp35_;
-	gint _tmp37_;
-	gint _tmp38_;
-	gboolean _tmp40_ = FALSE;
-	gint _tmp41_;
-	gint _tmp42_;
-	gboolean _tmp45_;
-	gboolean _tmp46_ = FALSE;
-	gint _tmp47_;
-	gint _tmp48_;
-	gint _tmp49_;
-	gboolean _tmp52_;
-	gboolean _tmp53_ = FALSE;
-	gint _tmp54_;
-	gint _tmp55_;
-	gboolean _tmp59_;
-	gboolean _tmp60_ = FALSE;
-	gint _tmp61_;
-	gint _tmp62_;
-	gint _tmp63_;
-	gboolean _tmp67_;
-	gint _tmp68_;
-	gint _tmp69_;
-	gint _tmp70_;
-	gint _tmp71_;
-	gint _tmp72_;
-	gint _tmp73_;
-	gint _tmp74_;
-	gint _tmp75_;
-	gint _tmp76_;
-	gint _tmp77_;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint dx = 0;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	gint dy = 0;
+	gint _tmp17_ = 0;
+	gint _tmp18_ = 0;
+	gint dw = 0;
+	gint _tmp19_ = 0;
+	gint _tmp20_ = 0;
+	gint dh = 0;
+	gint _tmp21_ = 0;
+	gint _tmp22_ = 0;
+	gint ix = 0;
+	gint _tmp23_ = 0;
+	gint _tmp24_ = 0;
+	gint iy = 0;
+	gint _tmp25_ = 0;
+	gint _tmp26_ = 0;
+	gboolean _tmp27_ = FALSE;
+	gboolean _tmp28_ = FALSE;
+	gboolean _tmp29_ = FALSE;
+	gint _tmp30_ = 0;
+	gboolean _tmp33_ = FALSE;
+	gboolean _tmp35_ = FALSE;
+	gboolean _tmp38_ = FALSE;
+	gchar* name = NULL;
+	Page* _tmp39_ = NULL;
+	const gchar* _tmp40_ = NULL;
+	const gchar* _tmp41_ = NULL;
+	gchar* _tmp42_ = NULL;
+	const gchar* _tmp43_ = NULL;
+	gint crop_border = 0;
+	gint _tmp44_ = 0;
+	gint _tmp45_ = 0;
+	gint _tmp47_ = 0;
+	gint _tmp48_ = 0;
+	gboolean _tmp50_ = FALSE;
+	gint _tmp51_ = 0;
+	gint _tmp52_ = 0;
+	gboolean _tmp55_ = FALSE;
+	gboolean _tmp56_ = FALSE;
+	gint _tmp57_ = 0;
+	gint _tmp58_ = 0;
+	gint _tmp59_ = 0;
+	gboolean _tmp62_ = FALSE;
+	gboolean _tmp63_ = FALSE;
+	gint _tmp64_ = 0;
+	gint _tmp65_ = 0;
+	gboolean _tmp69_ = FALSE;
+	gboolean _tmp70_ = FALSE;
+	gint _tmp71_ = 0;
+	gint _tmp72_ = 0;
+	gint _tmp73_ = 0;
+	gboolean _tmp77_ = FALSE;
+	gint _tmp78_ = 0;
+	gint _tmp79_ = 0;
+	gint _tmp80_ = 0;
+	gint _tmp81_ = 0;
+	gint _tmp82_ = 0;
+	gint _tmp83_ = 0;
+	gint _tmp84_ = 0;
+	gint _tmp85_ = 0;
+	gint _tmp86_ = 0;
+	gint _tmp87_ = 0;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->page;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = page_has_crop (_tmp0_);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (!_tmp1_) {
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->_page;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = page_get_has_crop (_tmp0_);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = _tmp1_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (!_tmp2_) {
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = 0;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4003 "page-view.c"
+#line 3911 "page-view.c"
 	}
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->page;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_get_crop (_tmp2_, &_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cx = _tmp3_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cy = _tmp4_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cw = _tmp5_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ch = _tmp6_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = cx;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = page_view_page_to_screen_x (self, _tmp7_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dx = _tmp8_;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = cy;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = page_view_page_to_screen_y (self, _tmp9_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dy = _tmp10_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = cw;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = page_view_page_to_screen_x (self, _tmp11_);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dw = _tmp12_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = ch;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = page_view_page_to_screen_y (self, _tmp13_);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dh = _tmp14_;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = x;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = dx;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ix = _tmp15_ - _tmp16_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = y;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = dy;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	iy = _tmp17_ - _tmp18_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = ix;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp22_ < 0) {
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp21_ = TRUE;
-#line 4059 "page-view.c"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = self->priv->_page;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = page_get_crop_x (_tmp3_);
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = _tmp4_;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	cx = _tmp5_;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = self->priv->_page;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp7_ = page_get_crop_y (_tmp6_);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = _tmp7_;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	cy = _tmp8_;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = self->priv->_page;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp10_ = page_get_crop_width (_tmp9_);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp11_ = _tmp10_;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	cw = _tmp11_;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = self->priv->_page;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = page_get_crop_height (_tmp12_);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp14_ = _tmp13_;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	ch = _tmp14_;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp15_ = cx;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp16_ = page_view_page_to_screen_x (self, _tmp15_);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	dx = _tmp16_;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp17_ = cy;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp18_ = page_view_page_to_screen_y (self, _tmp17_);
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	dy = _tmp18_;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp19_ = cw;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp20_ = page_view_page_to_screen_x (self, _tmp19_);
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	dw = _tmp20_;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp21_ = ch;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp22_ = page_view_page_to_screen_y (self, _tmp21_);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	dh = _tmp22_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp23_ = x;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp24_ = dx;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	ix = _tmp23_ - _tmp24_;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp25_ = y;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp26_ = dy;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	iy = _tmp25_ - _tmp26_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp30_ = ix;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp30_ < 0) {
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp29_ = TRUE;
+#line 3987 "page-view.c"
 	} else {
-		gint _tmp23_;
-		gint _tmp24_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp23_ = ix;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp24_ = dw;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp21_ = _tmp23_ > _tmp24_;
-#line 4069 "page-view.c"
+		gint _tmp31_ = 0;
+		gint _tmp32_ = 0;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp31_ = ix;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp32_ = dw;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp29_ = _tmp31_ > _tmp32_;
+#line 3997 "page-view.c"
 	}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = _tmp21_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp25_) {
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp20_ = TRUE;
-#line 4077 "page-view.c"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp33_ = _tmp29_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp33_) {
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp28_ = TRUE;
+#line 4005 "page-view.c"
 	} else {
-		gint _tmp26_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp26_ = iy;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp20_ = _tmp26_ < 0;
-#line 4084 "page-view.c"
+		gint _tmp34_ = 0;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp34_ = iy;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp28_ = _tmp34_ < 0;
+#line 4012 "page-view.c"
 	}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp27_ = _tmp20_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp27_) {
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp19_ = TRUE;
-#line 4092 "page-view.c"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp35_ = _tmp28_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp35_) {
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp27_ = TRUE;
+#line 4020 "page-view.c"
 	} else {
-		gint _tmp28_;
-		gint _tmp29_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = iy;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = dh;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp19_ = _tmp28_ > _tmp29_;
-#line 4102 "page-view.c"
+		gint _tmp36_ = 0;
+		gint _tmp37_ = 0;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp36_ = iy;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp37_ = dh;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp27_ = _tmp36_ > _tmp37_;
+#line 4030 "page-view.c"
 	}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp30_ = _tmp19_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp30_) {
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp38_ = _tmp27_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp38_) {
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_NONE;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4112 "page-view.c"
+#line 4040 "page-view.c"
 	}
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp31_ = self->priv->page;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp32_ = page_get_named_crop (_tmp31_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	name = _tmp32_;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp33_ = name;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp33_ != NULL) {
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp39_ = self->priv->_page;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp40_ = page_get_crop_name (_tmp39_);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp41_ = _tmp40_;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp42_ = g_strdup (_tmp41_);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	name = _tmp42_;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp43_ = name;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp43_ != NULL) {
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_MIDDLE;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4130 "page-view.c"
+#line 4062 "page-view.c"
 	}
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	crop_border = 20;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp34_ = dw;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp35_ = crop_border;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp34_ < (_tmp35_ * 3)) {
-#line 4140 "page-view.c"
-		gint _tmp36_;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = dw;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_border = _tmp36_ / 3;
-#line 4146 "page-view.c"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp44_ = dw;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp45_ = crop_border;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp44_ < (_tmp45_ * 3)) {
+#line 4072 "page-view.c"
+		gint _tmp46_ = 0;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp46_ = dw;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		crop_border = _tmp46_ / 3;
+#line 4078 "page-view.c"
 	}
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp37_ = dh;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp38_ = crop_border;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp37_ < (_tmp38_ * 3)) {
-#line 4154 "page-view.c"
-		gint _tmp39_;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = dh;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_border = _tmp39_ / 3;
-#line 4160 "page-view.c"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp47_ = dh;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp48_ = crop_border;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp47_ < (_tmp48_ * 3)) {
+#line 4086 "page-view.c"
+		gint _tmp49_ = 0;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp49_ = dh;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		crop_border = _tmp49_ / 3;
+#line 4092 "page-view.c"
 	}
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp41_ = ix;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp42_ = crop_border;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp41_ < _tmp42_) {
-#line 4168 "page-view.c"
-		gint _tmp43_;
-		gint _tmp44_;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = iy;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = crop_border;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = _tmp43_ < _tmp44_;
-#line 4177 "page-view.c"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp51_ = ix;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp52_ = crop_border;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp51_ < _tmp52_) {
+#line 4100 "page-view.c"
+		gint _tmp53_ = 0;
+		gint _tmp54_ = 0;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp53_ = iy;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp54_ = crop_border;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp50_ = _tmp53_ < _tmp54_;
+#line 4109 "page-view.c"
 	} else {
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = FALSE;
-#line 4181 "page-view.c"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp50_ = FALSE;
+#line 4113 "page-view.c"
 	}
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp45_ = _tmp40_;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp45_) {
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp55_ = _tmp50_;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp55_) {
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_LEFT;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4193 "page-view.c"
+#line 4125 "page-view.c"
 	}
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp47_ = ix;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp48_ = dw;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp49_ = crop_border;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp47_ > (_tmp48_ - _tmp49_)) {
-#line 4203 "page-view.c"
-		gint _tmp50_;
-		gint _tmp51_;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = iy;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp51_ = crop_border;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = _tmp50_ < _tmp51_;
-#line 4212 "page-view.c"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp57_ = ix;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp58_ = dw;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp59_ = crop_border;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp57_ > (_tmp58_ - _tmp59_)) {
+#line 4135 "page-view.c"
+		gint _tmp60_ = 0;
+		gint _tmp61_ = 0;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp60_ = iy;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp61_ = crop_border;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp56_ = _tmp60_ < _tmp61_;
+#line 4144 "page-view.c"
 	} else {
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = FALSE;
-#line 4216 "page-view.c"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp56_ = FALSE;
+#line 4148 "page-view.c"
 	}
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp52_ = _tmp46_;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp52_) {
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp62_ = _tmp56_;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp62_) {
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_RIGHT;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4228 "page-view.c"
+#line 4160 "page-view.c"
 	}
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp54_ = ix;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp55_ = crop_border;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp54_ < _tmp55_) {
-#line 4236 "page-view.c"
-		gint _tmp56_;
-		gint _tmp57_;
-		gint _tmp58_;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = iy;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp57_ = dh;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp58_ = crop_border;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = _tmp56_ > (_tmp57_ - _tmp58_);
-#line 4248 "page-view.c"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp64_ = ix;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp65_ = crop_border;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp64_ < _tmp65_) {
+#line 4168 "page-view.c"
+		gint _tmp66_ = 0;
+		gint _tmp67_ = 0;
+		gint _tmp68_ = 0;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp66_ = iy;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp67_ = dh;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp68_ = crop_border;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp63_ = _tmp66_ > (_tmp67_ - _tmp68_);
+#line 4180 "page-view.c"
 	} else {
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = FALSE;
-#line 4252 "page-view.c"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp63_ = FALSE;
+#line 4184 "page-view.c"
 	}
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp59_ = _tmp53_;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp59_) {
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp69_ = _tmp63_;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp69_) {
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_LEFT;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4264 "page-view.c"
+#line 4196 "page-view.c"
 	}
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp61_ = ix;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp62_ = dw;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp63_ = crop_border;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp61_ > (_tmp62_ - _tmp63_)) {
-#line 4274 "page-view.c"
-		gint _tmp64_;
-		gint _tmp65_;
-		gint _tmp66_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp64_ = iy;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp65_ = dh;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp66_ = crop_border;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = _tmp64_ > (_tmp65_ - _tmp66_);
-#line 4286 "page-view.c"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp71_ = ix;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp72_ = dw;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp73_ = crop_border;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp71_ > (_tmp72_ - _tmp73_)) {
+#line 4206 "page-view.c"
+		gint _tmp74_ = 0;
+		gint _tmp75_ = 0;
+		gint _tmp76_ = 0;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp74_ = iy;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp75_ = dh;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp76_ = crop_border;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp70_ = _tmp74_ > (_tmp75_ - _tmp76_);
+#line 4218 "page-view.c"
 	} else {
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = FALSE;
-#line 4290 "page-view.c"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp70_ = FALSE;
+#line 4222 "page-view.c"
 	}
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp67_ = _tmp60_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp67_) {
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp77_ = _tmp70_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp77_) {
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_RIGHT;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4302 "page-view.c"
+#line 4234 "page-view.c"
 	}
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp68_ = ix;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp69_ = crop_border;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp68_ < _tmp69_) {
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp78_ = ix;
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp79_ = crop_border;
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp78_ < _tmp79_) {
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_LEFT;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4316 "page-view.c"
+#line 4248 "page-view.c"
 	}
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp70_ = ix;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = dw;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = crop_border;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp70_ > (_tmp71_ - _tmp72_)) {
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp80_ = ix;
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp81_ = dw;
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp82_ = crop_border;
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp80_ > (_tmp81_ - _tmp82_)) {
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_RIGHT;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4332 "page-view.c"
+#line 4264 "page-view.c"
 	}
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = iy;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = crop_border;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp73_ < _tmp74_) {
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp83_ = iy;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp84_ = crop_border;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp83_ < _tmp84_) {
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP;
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4346 "page-view.c"
+#line 4278 "page-view.c"
 	}
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = iy;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp76_ = dh;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp77_ = crop_border;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp75_ > (_tmp76_ - _tmp77_)) {
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp85_ = iy;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp86_ = dh;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp87_ = crop_border;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp85_ > (_tmp86_ - _tmp87_)) {
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4362 "page-view.c"
+#line 4294 "page-view.c"
 	}
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = CROP_LOCATION_MIDDLE;
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_free0 (name);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 4370 "page-view.c"
+#line 4302 "page-view.c"
 }
 
 
 void page_view_button_press (PageView* self, gint x, gint y) {
 	CropLocation location = 0;
-	gint _tmp0_;
-	gint _tmp1_;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
 	CropLocation _tmp2_ = 0;
-	CropLocation _tmp3_;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	CropLocation _tmp3_ = 0;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = y;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	location = _tmp2_;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = location;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_ != CROP_LOCATION_NONE) {
-#line 4394 "page-view.c"
-		CropLocation _tmp4_;
-		gint _tmp5_;
-		gint _tmp6_;
-		Page* _tmp7_;
+#line 4326 "page-view.c"
+		CropLocation _tmp4_ = 0;
+		gint _tmp5_ = 0;
+		gint _tmp6_ = 0;
+		Page* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+		Page* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		gint _tmp12_ = 0;
+		Page* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
+		gint _tmp15_ = 0;
+		Page* _tmp16_ = NULL;
+		gint _tmp17_ = 0;
+		gint _tmp18_ = 0;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = location;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->crop_location = _tmp4_;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = x;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_px = (gdouble) _tmp5_;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = y;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_py = (gdouble) _tmp6_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = self->priv->page;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_get_crop (_tmp7_, &_tmp8_, &_tmp9_, &_tmp10_, &_tmp11_);
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_x = _tmp8_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_y = _tmp9_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_w = _tmp10_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->selected_crop_h = _tmp11_;
-#line 4427 "page-view.c"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = self->priv->_page;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp8_ = page_get_crop_x (_tmp7_);
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp9_ = _tmp8_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		self->priv->selected_crop_x = _tmp9_;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp10_ = self->priv->_page;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = page_get_crop_y (_tmp10_);
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp12_ = _tmp11_;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		self->priv->selected_crop_y = _tmp12_;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp13_ = self->priv->_page;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp14_ = page_get_crop_width (_tmp13_);
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp15_ = _tmp14_;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		self->priv->selected_crop_w = _tmp15_;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp16_ = self->priv->_page;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp17_ = page_get_crop_height (_tmp16_);
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp18_ = _tmp17_;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		self->priv->selected_crop_h = _tmp18_;
+#line 4386 "page-view.c"
 	}
 }
 
 
 void page_view_motion (PageView* self, gint x, gint y) {
-	gint _tmp0_;
-	gint _tmp1_;
+	CropLocation location = 0;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
 	CropLocation _tmp2_ = 0;
-	CropLocation location;
 	GdkCursorType cursor = 0;
-	CropLocation _tmp3_;
-	CropLocation _tmp4_;
-	Page* _tmp6_;
+	CropLocation _tmp3_ = 0;
+	CropLocation _tmp4_ = 0;
+	gint pw = 0;
+	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-	gint pw;
-	Page* _tmp8_;
-	gint _tmp9_ = 0;
-	gint ph;
-	gint cx = 0;
-	gint cy = 0;
-	gint cw = 0;
-	gint ch = 0;
-	Page* _tmp10_;
+	gint _tmp8_ = 0;
+	gint ph = 0;
+	Page* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
+	gint cw = 0;
+	Page* _tmp12_ = NULL;
 	gint _tmp13_ = 0;
 	gint _tmp14_ = 0;
-	gint _tmp15_;
-	gdouble _tmp16_;
+	gint ch = 0;
+	Page* _tmp15_ = NULL;
+	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-	gint dx;
-	gint _tmp18_;
-	gdouble _tmp19_;
+	gint dx = 0;
+	gint _tmp18_ = 0;
+	gdouble _tmp19_ = 0.0;
 	gint _tmp20_ = 0;
-	gint dy;
-	gint _tmp21_;
-	gint new_x;
-	gint _tmp22_;
-	gint new_y;
-	gint _tmp23_;
-	gint new_w;
-	gint _tmp24_;
-	gint new_h;
+	gint dy = 0;
+	gint _tmp21_ = 0;
+	gdouble _tmp22_ = 0.0;
+	gint _tmp23_ = 0;
+	gint new_x = 0;
+	gint _tmp24_ = 0;
+	gint new_y = 0;
 	gint _tmp25_ = 0;
-	gint min_size;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	CropLocation _tmp28_;
-	gboolean _tmp30_;
-	gboolean _tmp32_;
-	gboolean _tmp41_ = FALSE;
-	gboolean _tmp42_ = FALSE;
-	CropLocation _tmp43_;
-	gboolean _tmp45_;
-	gboolean _tmp47_;
-	gboolean _tmp56_ = FALSE;
-	gboolean _tmp57_ = FALSE;
-	CropLocation _tmp58_;
-	gboolean _tmp60_;
-	gboolean _tmp62_;
-	gboolean _tmp75_ = FALSE;
-	gboolean _tmp76_ = FALSE;
-	CropLocation _tmp77_;
-	gboolean _tmp79_;
-	gboolean _tmp81_;
-	CropLocation _tmp94_;
-	CropLocation _tmp115_;
-	gboolean _tmp120_ = FALSE;
-	gboolean _tmp121_ = FALSE;
-	CropLocation _tmp122_;
-	gboolean _tmp124_;
-	gboolean _tmp126_;
-	gboolean _tmp131_ = FALSE;
-	gboolean _tmp132_ = FALSE;
-	CropLocation _tmp133_;
-	gboolean _tmp135_;
-	gboolean _tmp137_;
-	gboolean _tmp142_ = FALSE;
-	gboolean _tmp143_ = FALSE;
-	CropLocation _tmp144_;
-	gboolean _tmp146_;
-	gboolean _tmp148_;
+	gint new_w = 0;
+	gint _tmp26_ = 0;
+	gint new_h = 0;
+	gint _tmp27_ = 0;
+	gint min_size = 0;
+	gint _tmp28_ = 0;
+	gboolean _tmp29_ = FALSE;
+	gboolean _tmp30_ = FALSE;
+	CropLocation _tmp31_ = 0;
+	gboolean _tmp33_ = FALSE;
+	gboolean _tmp35_ = FALSE;
+	gboolean _tmp44_ = FALSE;
+	gboolean _tmp45_ = FALSE;
+	CropLocation _tmp46_ = 0;
+	gboolean _tmp48_ = FALSE;
+	gboolean _tmp50_ = FALSE;
+	gboolean _tmp59_ = FALSE;
+	gboolean _tmp60_ = FALSE;
+	CropLocation _tmp61_ = 0;
+	gboolean _tmp63_ = FALSE;
+	gboolean _tmp65_ = FALSE;
+	gboolean _tmp78_ = FALSE;
+	gboolean _tmp79_ = FALSE;
+	CropLocation _tmp80_ = 0;
+	gboolean _tmp82_ = FALSE;
+	gboolean _tmp84_ = FALSE;
+	CropLocation _tmp97_ = 0;
+	CropLocation _tmp118_ = 0;
+	gboolean _tmp123_ = FALSE;
+	gboolean _tmp124_ = FALSE;
+	CropLocation _tmp125_ = 0;
+	gboolean _tmp127_ = FALSE;
+	gboolean _tmp129_ = FALSE;
+	gboolean _tmp134_ = FALSE;
+	gboolean _tmp135_ = FALSE;
+	CropLocation _tmp136_ = 0;
+	gboolean _tmp138_ = FALSE;
+	gboolean _tmp140_ = FALSE;
+	gboolean _tmp145_ = FALSE;
+	gboolean _tmp146_ = FALSE;
+	CropLocation _tmp147_ = 0;
+	gboolean _tmp149_ = FALSE;
 	gboolean _tmp151_ = FALSE;
-	gboolean _tmp152_ = FALSE;
-	CropLocation _tmp153_;
-	gboolean _tmp155_;
-	gboolean _tmp157_;
-	Page* _tmp160_;
-	gint _tmp161_;
-	gint _tmp162_;
-	gboolean _tmp163_ = FALSE;
-	gint _tmp164_;
-	gint _tmp165_;
-	gboolean _tmp168_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gboolean _tmp154_ = FALSE;
+	gboolean _tmp155_ = FALSE;
+	CropLocation _tmp156_ = 0;
+	gboolean _tmp158_ = FALSE;
+	gboolean _tmp160_ = FALSE;
+	Page* _tmp163_ = NULL;
+	gint _tmp164_ = 0;
+	gint _tmp165_ = 0;
+	gboolean _tmp166_ = FALSE;
+	gint _tmp167_ = 0;
+	gint _tmp168_ = 0;
+	gboolean _tmp171_ = FALSE;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = y;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	location = _tmp2_;
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = location;
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	switch (_tmp3_) {
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_MIDDLE:
-#line 4538 "page-view.c"
+#line 4498 "page-view.c"
 		{
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_HAND1;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4544 "page-view.c"
+#line 4504 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP:
-#line 4548 "page-view.c"
+#line 4508 "page-view.c"
 		{
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_SIDE;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4554 "page-view.c"
+#line 4514 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM:
-#line 4558 "page-view.c"
+#line 4518 "page-view.c"
 		{
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_SIDE;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4564 "page-view.c"
+#line 4524 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_LEFT:
-#line 4568 "page-view.c"
+#line 4528 "page-view.c"
 		{
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_LEFT_SIDE;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4574 "page-view.c"
+#line 4534 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_RIGHT:
-#line 4578 "page-view.c"
+#line 4538 "page-view.c"
 		{
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_RIGHT_SIDE;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4584 "page-view.c"
+#line 4544 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_LEFT:
-#line 4588 "page-view.c"
+#line 4548 "page-view.c"
 		{
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_LEFT_CORNER;
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4594 "page-view.c"
+#line 4554 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_RIGHT:
-#line 4598 "page-view.c"
+#line 4558 "page-view.c"
 		{
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_RIGHT_CORNER;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4604 "page-view.c"
+#line 4564 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_LEFT:
-#line 4608 "page-view.c"
+#line 4568 "page-view.c"
 		{
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_LEFT_CORNER;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4614 "page-view.c"
+#line 4574 "page-view.c"
 		}
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_RIGHT:
-#line 4618 "page-view.c"
+#line 4578 "page-view.c"
 		{
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_RIGHT_CORNER;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4624 "page-view.c"
+#line 4584 "page-view.c"
 		}
 		default:
 		{
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_ARROW;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4632 "page-view.c"
+#line 4592 "page-view.c"
 		}
 	}
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->crop_location;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp4_ == CROP_LOCATION_NONE) {
-#line 4639 "page-view.c"
-		GdkCursorType _tmp5_;
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 4599 "page-view.c"
+		GdkCursorType _tmp5_ = 0;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = cursor;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		page_view_set_cursor (self, _tmp5_);
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		return;
+#line 4607 "page-view.c"
+	}
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = self->priv->_page;
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp7_ = page_get_width (_tmp6_);
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = _tmp7_;
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	pw = _tmp8_;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = self->priv->_page;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp10_ = page_get_height (_tmp9_);
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp11_ = _tmp10_;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	ph = _tmp11_;
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = self->priv->_page;
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = page_get_crop_width (_tmp12_);
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp14_ = _tmp13_;
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	cw = _tmp14_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp15_ = self->priv->_page;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp16_ = page_get_crop_height (_tmp15_);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp17_ = _tmp16_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	ch = _tmp17_;
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp18_ = x;
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp19_ = self->priv->selected_crop_px;
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp20_ = page_view_screen_to_page_x (self, _tmp18_ - ((gint) _tmp19_));
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	dx = _tmp20_;
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp21_ = y;
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp22_ = self->priv->selected_crop_py;
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp23_ = page_view_screen_to_page_y (self, _tmp21_ - ((gint) _tmp22_));
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	dy = _tmp23_;
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp24_ = self->priv->selected_crop_x;
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	new_x = _tmp24_;
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp25_ = self->priv->selected_crop_y;
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	new_y = _tmp25_;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp26_ = self->priv->selected_crop_w;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	new_w = _tmp26_;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp27_ = self->priv->selected_crop_h;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	new_h = _tmp27_;
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp28_ = page_view_screen_to_page_x (self, 15);
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	min_size = _tmp28_;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp31_ = self->priv->crop_location;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp31_ == CROP_LOCATION_TOP_LEFT) {
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp30_ = TRUE;
+#line 4683 "page-view.c"
+	} else {
+		CropLocation _tmp32_ = 0;
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp32_ = self->priv->crop_location;
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp30_ = _tmp32_ == CROP_LOCATION_LEFT;
+#line 4690 "page-view.c"
+	}
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp33_ = _tmp30_;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp33_) {
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp29_ = TRUE;
+#line 4698 "page-view.c"
+	} else {
+		CropLocation _tmp34_ = 0;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp34_ = self->priv->crop_location;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp29_ = _tmp34_ == CROP_LOCATION_BOTTOM_LEFT;
+#line 4705 "page-view.c"
+	}
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp35_ = _tmp29_;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp35_) {
+#line 4711 "page-view.c"
+		gint _tmp36_ = 0;
+		gint _tmp37_ = 0;
+		gint _tmp38_ = 0;
+		gint _tmp41_ = 0;
+		gint _tmp42_ = 0;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp36_ = dx;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp37_ = new_w;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp38_ = min_size;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp36_ > (_tmp37_ - _tmp38_)) {
+#line 4725 "page-view.c"
+			gint _tmp39_ = 0;
+			gint _tmp40_ = 0;
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp39_ = new_w;
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp40_ = min_size;
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			dx = _tmp39_ - _tmp40_;
+#line 4734 "page-view.c"
+		}
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp41_ = new_x;
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp42_ = dx;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		self->priv->cursor = _tmp5_;
+		if ((_tmp41_ + _tmp42_) < 0) {
+#line 4742 "page-view.c"
+			gint _tmp43_ = 0;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 4647 "page-view.c"
+			_tmp43_ = new_x;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			dx = -_tmp43_;
+#line 4748 "page-view.c"
+		}
 	}
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp46_ = self->priv->crop_location;
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp46_ == CROP_LOCATION_TOP_LEFT) {
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp45_ = TRUE;
+#line 4757 "page-view.c"
+	} else {
+		CropLocation _tmp47_ = 0;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp47_ = self->priv->crop_location;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp45_ = _tmp47_ == CROP_LOCATION_TOP;
+#line 4764 "page-view.c"
+	}
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp48_ = _tmp45_;
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp48_) {
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp44_ = TRUE;
+#line 4772 "page-view.c"
+	} else {
+		CropLocation _tmp49_ = 0;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->page;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = page_get_width (_tmp6_);
+		_tmp49_ = self->priv->crop_location;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	pw = _tmp7_;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->page;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = page_get_height (_tmp8_);
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ph = _tmp9_;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = self->priv->page;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_get_crop (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_, &_tmp14_);
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cx = _tmp11_;
+		_tmp44_ = _tmp49_ == CROP_LOCATION_TOP_RIGHT;
+#line 4779 "page-view.c"
+	}
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp50_ = _tmp44_;
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp50_) {
+#line 4785 "page-view.c"
+		gint _tmp51_ = 0;
+		gint _tmp52_ = 0;
+		gint _tmp53_ = 0;
+		gint _tmp56_ = 0;
+		gint _tmp57_ = 0;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp51_ = dy;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp52_ = new_h;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp53_ = min_size;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp51_ > (_tmp52_ - _tmp53_)) {
+#line 4799 "page-view.c"
+			gint _tmp54_ = 0;
+			gint _tmp55_ = 0;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cy = _tmp12_;
+			_tmp54_ = new_h;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	cw = _tmp13_;
+			_tmp55_ = min_size;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	ch = _tmp14_;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = x;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = self->priv->selected_crop_px;
+			dy = _tmp54_ - _tmp55_;
+#line 4808 "page-view.c"
+		}
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp56_ = new_y;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp57_ = dy;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if ((_tmp56_ + _tmp57_) < 0) {
+#line 4816 "page-view.c"
+			gint _tmp58_ = 0;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = page_view_screen_to_page_x (self, _tmp15_ - ((gint) _tmp16_));
+			_tmp58_ = new_y;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dx = _tmp17_;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = y;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = self->priv->selected_crop_py;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = page_view_screen_to_page_y (self, _tmp18_ - ((gint) _tmp19_));
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	dy = _tmp20_;
+			dy = -_tmp58_;
+#line 4822 "page-view.c"
+		}
+	}
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp61_ = self->priv->crop_location;
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = self->priv->selected_crop_x;
+	if (_tmp61_ == CROP_LOCATION_TOP_RIGHT) {
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_x = _tmp21_;
+		_tmp60_ = TRUE;
+#line 4831 "page-view.c"
+	} else {
+		CropLocation _tmp62_ = 0;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = self->priv->selected_crop_y;
+		_tmp62_ = self->priv->crop_location;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_y = _tmp22_;
+		_tmp60_ = _tmp62_ == CROP_LOCATION_RIGHT;
+#line 4838 "page-view.c"
+	}
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp63_ = _tmp60_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp63_) {
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp59_ = TRUE;
+#line 4846 "page-view.c"
+	} else {
+		CropLocation _tmp64_ = 0;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = self->priv->selected_crop_w;
+		_tmp64_ = self->priv->crop_location;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_w = _tmp23_;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = self->priv->selected_crop_h;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	new_h = _tmp24_;
+		_tmp59_ = _tmp64_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 4853 "page-view.c"
+	}
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp65_ = _tmp59_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp65_) {
+#line 4859 "page-view.c"
+		gint _tmp66_ = 0;
+		gint _tmp67_ = 0;
+		gint _tmp68_ = 0;
+		gint _tmp71_ = 0;
+		gint _tmp72_ = 0;
+		gint _tmp73_ = 0;
+		gint _tmp74_ = 0;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp66_ = dx;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp67_ = min_size;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp68_ = new_w;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp66_ < (_tmp67_ - _tmp68_)) {
+#line 4875 "page-view.c"
+			gint _tmp69_ = 0;
+			gint _tmp70_ = 0;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp69_ = min_size;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp70_ = new_w;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			dx = _tmp69_ - _tmp70_;
+#line 4884 "page-view.c"
+		}
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = page_view_screen_to_page_x (self, 15);
+		_tmp71_ = new_x;
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	min_size = _tmp25_;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp28_ = self->priv->crop_location;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp28_ == CROP_LOCATION_TOP_LEFT) {
+		_tmp72_ = new_w;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp73_ = dx;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp74_ = pw;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (((_tmp71_ + _tmp72_) + _tmp73_) > _tmp74_) {
+#line 4896 "page-view.c"
+			gint _tmp75_ = 0;
+			gint _tmp76_ = 0;
+			gint _tmp77_ = 0;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = TRUE;
-#line 4715 "page-view.c"
-	} else {
-		CropLocation _tmp29_;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = self->priv->crop_location;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = _tmp29_ == CROP_LOCATION_LEFT;
-#line 4722 "page-view.c"
-	}
+			_tmp75_ = pw;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp30_ = _tmp27_;
+			_tmp76_ = new_x;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp30_) {
+			_tmp77_ = new_w;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp26_ = TRUE;
-#line 4730 "page-view.c"
-	} else {
-		CropLocation _tmp31_;
+			dx = (_tmp75_ - _tmp76_) - _tmp77_;
+#line 4908 "page-view.c"
+		}
+	}
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp80_ = self->priv->crop_location;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp31_ = self->priv->crop_location;
+	if (_tmp80_ == CROP_LOCATION_BOTTOM_LEFT) {
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp26_ = _tmp31_ == CROP_LOCATION_BOTTOM_LEFT;
-#line 4737 "page-view.c"
+		_tmp79_ = TRUE;
+#line 4917 "page-view.c"
+	} else {
+		CropLocation _tmp81_ = 0;
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp81_ = self->priv->crop_location;
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp79_ = _tmp81_ == CROP_LOCATION_BOTTOM;
+#line 4924 "page-view.c"
 	}
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp32_ = _tmp26_;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp32_) {
-#line 4743 "page-view.c"
-		gint _tmp33_;
-		gint _tmp34_;
-		gint _tmp35_;
-		gint _tmp38_;
-		gint _tmp39_;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp33_ = dx;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = new_w;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp82_ = _tmp79_;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp82_) {
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp78_ = TRUE;
+#line 4932 "page-view.c"
+	} else {
+		CropLocation _tmp83_ = 0;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = min_size;
+		_tmp83_ = self->priv->crop_location;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp33_ > (_tmp34_ - _tmp35_)) {
-#line 4757 "page-view.c"
-			gint _tmp36_;
-			gint _tmp37_;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp36_ = new_w;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37_ = min_size;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = _tmp36_ - _tmp37_;
-#line 4766 "page-view.c"
-		}
+		_tmp78_ = _tmp83_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 4939 "page-view.c"
+	}
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp84_ = _tmp78_;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp84_) {
+#line 4945 "page-view.c"
+		gint _tmp85_ = 0;
+		gint _tmp86_ = 0;
+		gint _tmp87_ = 0;
+		gint _tmp90_ = 0;
+		gint _tmp91_ = 0;
+		gint _tmp92_ = 0;
+		gint _tmp93_ = 0;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp85_ = dy;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = new_x;
+		_tmp86_ = min_size;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = dx;
+		_tmp87_ = new_h;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp38_ + _tmp39_) < 0) {
-#line 4774 "page-view.c"
-			gint _tmp40_;
+		if (_tmp85_ < (_tmp86_ - _tmp87_)) {
+#line 4961 "page-view.c"
+			gint _tmp88_ = 0;
+			gint _tmp89_ = 0;
 #line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp40_ = new_x;
+			_tmp88_ = min_size;
 #line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = -_tmp40_;
-#line 4780 "page-view.c"
+			_tmp89_ = new_h;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			dy = _tmp88_ - _tmp89_;
+#line 4970 "page-view.c"
 		}
-	}
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp43_ = self->priv->crop_location;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp90_ = new_y;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp91_ = new_h;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp92_ = dy;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp93_ = ph;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (((_tmp90_ + _tmp91_) + _tmp92_) > _tmp93_) {
+#line 4982 "page-view.c"
+			gint _tmp94_ = 0;
+			gint _tmp95_ = 0;
+			gint _tmp96_ = 0;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp43_ == CROP_LOCATION_TOP_LEFT) {
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = TRUE;
-#line 4789 "page-view.c"
-	} else {
-		CropLocation _tmp44_;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = self->priv->crop_location;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = _tmp44_ == CROP_LOCATION_TOP;
-#line 4796 "page-view.c"
-	}
+			_tmp94_ = ph;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp45_ = _tmp42_;
+			_tmp95_ = new_y;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp45_) {
+			_tmp96_ = new_h;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = TRUE;
-#line 4804 "page-view.c"
-	} else {
-		CropLocation _tmp46_;
+			dy = (_tmp94_ - _tmp95_) - _tmp96_;
+#line 4994 "page-view.c"
+		}
+	}
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = self->priv->crop_location;
+	_tmp97_ = self->priv->crop_location;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = _tmp46_ == CROP_LOCATION_TOP_RIGHT;
-#line 4811 "page-view.c"
-	}
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp47_ = _tmp41_;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp47_) {
-#line 4817 "page-view.c"
-		gint _tmp48_;
-		gint _tmp49_;
-		gint _tmp50_;
-		gint _tmp53_;
-		gint _tmp54_;
+	if (_tmp97_ == CROP_LOCATION_MIDDLE) {
+#line 5001 "page-view.c"
+		gint _tmp98_ = 0;
+		gint _tmp99_ = 0;
+		gint _tmp100_ = 0;
+		gint _tmp101_ = 0;
+		gint _tmp105_ = 0;
+		gint _tmp106_ = 0;
+		gint _tmp108_ = 0;
+		gint _tmp109_ = 0;
+		gint _tmp110_ = 0;
+		gint _tmp111_ = 0;
+		gint _tmp115_ = 0;
+		gint _tmp116_ = 0;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48_ = dy;
+		_tmp98_ = new_x;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = new_h;
+		_tmp99_ = dx;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = min_size;
+		_tmp100_ = new_w;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp48_ > (_tmp49_ - _tmp50_)) {
-#line 4831 "page-view.c"
-			gint _tmp51_;
-			gint _tmp52_;
+		_tmp101_ = pw;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (((_tmp98_ + _tmp99_) + _tmp100_) > _tmp101_) {
+#line 5024 "page-view.c"
+			gint _tmp102_ = 0;
+			gint _tmp103_ = 0;
+			gint _tmp104_ = 0;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp102_ = pw;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp51_ = new_h;
+			_tmp103_ = new_x;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp52_ = min_size;
+			_tmp104_ = new_w;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = _tmp51_ - _tmp52_;
-#line 4840 "page-view.c"
+			dx = (_tmp102_ - _tmp103_) - _tmp104_;
+#line 5036 "page-view.c"
 		}
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = new_y;
+		_tmp105_ = new_x;
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp54_ = dy;
+		_tmp106_ = dx;
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp53_ + _tmp54_) < 0) {
-#line 4848 "page-view.c"
-			gint _tmp55_;
+		if ((_tmp105_ + _tmp106_) < 0) {
+#line 5044 "page-view.c"
+			gint _tmp107_ = 0;
 #line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55_ = new_y;
+			_tmp107_ = new_x;
 #line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = -_tmp55_;
-#line 4854 "page-view.c"
+			dx = -_tmp107_;
+#line 5050 "page-view.c"
+		}
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp108_ = new_y;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp109_ = dy;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp110_ = new_h;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp111_ = ph;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (((_tmp108_ + _tmp109_) + _tmp110_) > _tmp111_) {
+#line 5062 "page-view.c"
+			gint _tmp112_ = 0;
+			gint _tmp113_ = 0;
+			gint _tmp114_ = 0;
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp112_ = ph;
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp113_ = new_y;
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp114_ = new_h;
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			dy = (_tmp112_ - _tmp113_) - _tmp114_;
+#line 5074 "page-view.c"
 		}
-	}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp58_ = self->priv->crop_location;
+		_tmp115_ = new_y;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp58_ == CROP_LOCATION_TOP_RIGHT) {
+		_tmp116_ = dy;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp57_ = TRUE;
-#line 4863 "page-view.c"
-	} else {
-		CropLocation _tmp59_;
+		if ((_tmp115_ + _tmp116_) < 0) {
+#line 5082 "page-view.c"
+			gint _tmp117_ = 0;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp59_ = self->priv->crop_location;
+			_tmp117_ = new_y;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp57_ = _tmp59_ == CROP_LOCATION_RIGHT;
-#line 4870 "page-view.c"
-	}
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp60_ = _tmp57_;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp60_) {
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = TRUE;
-#line 4878 "page-view.c"
-	} else {
-		CropLocation _tmp61_;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp61_ = self->priv->crop_location;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = _tmp61_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 4885 "page-view.c"
+			dy = -_tmp117_;
+#line 5088 "page-view.c"
+		}
 	}
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp62_ = _tmp56_;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp62_) {
-#line 4891 "page-view.c"
-		gint _tmp63_;
-		gint _tmp64_;
-		gint _tmp65_;
-		gint _tmp68_;
-		gint _tmp69_;
-		gint _tmp70_;
-		gint _tmp71_;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp63_ = dx;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp64_ = min_size;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp65_ = new_w;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp63_ < (_tmp64_ - _tmp65_)) {
-#line 4907 "page-view.c"
-			gint _tmp66_;
-			gint _tmp67_;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp66_ = min_size;
 #line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp67_ = new_w;
+	_tmp118_ = self->priv->crop_location;
 #line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = _tmp66_ - _tmp67_;
-#line 4916 "page-view.c"
-		}
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp68_ = new_x;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp69_ = new_w;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = dx;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp71_ = pw;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp68_ + _tmp69_) + _tmp70_) > _tmp71_) {
-#line 4928 "page-view.c"
-			gint _tmp72_;
-			gint _tmp73_;
-			gint _tmp74_;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp72_ = pw;
+	if (_tmp118_ == CROP_LOCATION_MIDDLE) {
+#line 5095 "page-view.c"
+		gint _tmp119_ = 0;
+		gint _tmp120_ = 0;
+		gint _tmp121_ = 0;
+		gint _tmp122_ = 0;
 #line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp73_ = new_x;
+		_tmp119_ = new_x;
 #line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp74_ = new_w;
+		_tmp120_ = dx;
 #line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = (_tmp72_ - _tmp73_) - _tmp74_;
-#line 4940 "page-view.c"
-		}
+		new_x = _tmp119_ + _tmp120_;
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp121_ = new_y;
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp122_ = dy;
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		new_y = _tmp121_ + _tmp122_;
+#line 5112 "page-view.c"
 	}
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp77_ = self->priv->crop_location;
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp77_ == CROP_LOCATION_BOTTOM_LEFT) {
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = TRUE;
-#line 4949 "page-view.c"
-	} else {
-		CropLocation _tmp78_;
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = self->priv->crop_location;
+	_tmp125_ = self->priv->crop_location;
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = _tmp78_ == CROP_LOCATION_BOTTOM;
-#line 4956 "page-view.c"
-	}
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp79_ = _tmp76_;
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp79_) {
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp75_ = TRUE;
-#line 4964 "page-view.c"
+	if (_tmp125_ == CROP_LOCATION_TOP_LEFT) {
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp124_ = TRUE;
+#line 5120 "page-view.c"
 	} else {
-		CropLocation _tmp80_;
+		CropLocation _tmp126_ = 0;
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp80_ = self->priv->crop_location;
+		_tmp126_ = self->priv->crop_location;
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp75_ = _tmp80_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 4971 "page-view.c"
+		_tmp124_ = _tmp126_ == CROP_LOCATION_LEFT;
+#line 5127 "page-view.c"
+	}
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp127_ = _tmp124_;
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp127_) {
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp123_ = TRUE;
+#line 5135 "page-view.c"
+	} else {
+		CropLocation _tmp128_ = 0;
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp128_ = self->priv->crop_location;
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp123_ = _tmp128_ == CROP_LOCATION_BOTTOM_LEFT;
+#line 5142 "page-view.c"
 	}
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp81_ = _tmp75_;
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp81_) {
-#line 4977 "page-view.c"
-		gint _tmp82_;
-		gint _tmp83_;
-		gint _tmp84_;
-		gint _tmp87_;
-		gint _tmp88_;
-		gint _tmp89_;
-		gint _tmp90_;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp82_ = dy;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp83_ = min_size;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp84_ = new_h;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp82_ < (_tmp83_ - _tmp84_)) {
-#line 4993 "page-view.c"
-			gint _tmp85_;
-			gint _tmp86_;
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp129_ = _tmp123_;
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp129_) {
+#line 5148 "page-view.c"
+		gint _tmp130_ = 0;
+		gint _tmp131_ = 0;
+		gint _tmp132_ = 0;
+		gint _tmp133_ = 0;
 #line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp85_ = min_size;
+		_tmp130_ = new_x;
 #line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp86_ = new_h;
+		_tmp131_ = dx;
 #line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = _tmp85_ - _tmp86_;
-#line 5002 "page-view.c"
-		}
+		new_x = _tmp130_ + _tmp131_;
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp87_ = new_y;
+		_tmp132_ = new_w;
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp88_ = new_h;
+		_tmp133_ = dx;
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp89_ = dy;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp90_ = ph;
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp87_ + _tmp88_) + _tmp89_) > _tmp90_) {
-#line 5014 "page-view.c"
-			gint _tmp91_;
-			gint _tmp92_;
-			gint _tmp93_;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp91_ = ph;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp92_ = new_y;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp93_ = new_h;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = (_tmp91_ - _tmp92_) - _tmp93_;
-#line 5026 "page-view.c"
-		}
+		new_w = _tmp132_ - _tmp133_;
+#line 5165 "page-view.c"
 	}
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp136_ = self->priv->crop_location;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp136_ == CROP_LOCATION_TOP_LEFT) {
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp135_ = TRUE;
+#line 5173 "page-view.c"
+	} else {
+		CropLocation _tmp137_ = 0;
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp94_ = self->priv->crop_location;
+		_tmp137_ = self->priv->crop_location;
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp94_ == CROP_LOCATION_MIDDLE) {
-#line 5033 "page-view.c"
-		gint _tmp95_;
-		gint _tmp96_;
-		gint _tmp97_;
-		gint _tmp98_;
-		gint _tmp102_;
-		gint _tmp103_;
-		gint _tmp105_;
-		gint _tmp106_;
-		gint _tmp107_;
-		gint _tmp108_;
-		gint _tmp112_;
-		gint _tmp113_;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp95_ = new_x;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp96_ = dx;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp97_ = new_w;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp98_ = pw;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp95_ + _tmp96_) + _tmp97_) > _tmp98_) {
-#line 5056 "page-view.c"
-			gint _tmp99_;
-			gint _tmp100_;
-			gint _tmp101_;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp99_ = pw;
+		_tmp135_ = _tmp137_ == CROP_LOCATION_TOP;
+#line 5180 "page-view.c"
+	}
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp138_ = _tmp135_;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp138_) {
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp134_ = TRUE;
+#line 5188 "page-view.c"
+	} else {
+		CropLocation _tmp139_ = 0;
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp139_ = self->priv->crop_location;
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp134_ = _tmp139_ == CROP_LOCATION_TOP_RIGHT;
+#line 5195 "page-view.c"
+	}
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp140_ = _tmp134_;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp140_) {
+#line 5201 "page-view.c"
+		gint _tmp141_ = 0;
+		gint _tmp142_ = 0;
+		gint _tmp143_ = 0;
+		gint _tmp144_ = 0;
 #line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp100_ = new_x;
+		_tmp141_ = new_y;
 #line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp101_ = new_w;
+		_tmp142_ = dy;
 #line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = (_tmp99_ - _tmp100_) - _tmp101_;
-#line 5068 "page-view.c"
-		}
+		new_y = _tmp141_ + _tmp142_;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp102_ = new_x;
+		_tmp143_ = new_h;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp103_ = dx;
+		_tmp144_ = dy;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp102_ + _tmp103_) < 0) {
-#line 5076 "page-view.c"
-			gint _tmp104_;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp104_ = new_x;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = -_tmp104_;
-#line 5082 "page-view.c"
-		}
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp105_ = new_y;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp106_ = dy;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp107_ = new_h;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp108_ = ph;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp105_ + _tmp106_) + _tmp107_) > _tmp108_) {
-#line 5094 "page-view.c"
-			gint _tmp109_;
-			gint _tmp110_;
-			gint _tmp111_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp109_ = ph;
+		new_h = _tmp143_ - _tmp144_;
+#line 5218 "page-view.c"
+	}
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp110_ = new_y;
+	_tmp147_ = self->priv->crop_location;
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp111_ = new_h;
+	if (_tmp147_ == CROP_LOCATION_TOP_RIGHT) {
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = (_tmp109_ - _tmp110_) - _tmp111_;
-#line 5106 "page-view.c"
-		}
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp112_ = new_y;
+		_tmp146_ = TRUE;
+#line 5226 "page-view.c"
+	} else {
+		CropLocation _tmp148_ = 0;
 #line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp113_ = dy;
+		_tmp148_ = self->priv->crop_location;
 #line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp112_ + _tmp113_) < 0) {
-#line 5114 "page-view.c"
-			gint _tmp114_;
+		_tmp146_ = _tmp148_ == CROP_LOCATION_RIGHT;
+#line 5233 "page-view.c"
+	}
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp149_ = _tmp146_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp149_) {
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp145_ = TRUE;
+#line 5241 "page-view.c"
+	} else {
+		CropLocation _tmp150_ = 0;
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp114_ = new_y;
+		_tmp150_ = self->priv->crop_location;
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = -_tmp114_;
-#line 5120 "page-view.c"
-		}
+		_tmp145_ = _tmp150_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 5248 "page-view.c"
+	}
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp151_ = _tmp145_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp151_) {
+#line 5254 "page-view.c"
+		gint _tmp152_ = 0;
+		gint _tmp153_ = 0;
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp152_ = new_w;
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp153_ = dx;
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		new_w = _tmp152_ + _tmp153_;
+#line 5263 "page-view.c"
+	}
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp156_ = self->priv->crop_location;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp156_ == CROP_LOCATION_BOTTOM_LEFT) {
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp155_ = TRUE;
+#line 5271 "page-view.c"
+	} else {
+		CropLocation _tmp157_ = 0;
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp157_ = self->priv->crop_location;
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp155_ = _tmp157_ == CROP_LOCATION_BOTTOM;
+#line 5278 "page-view.c"
 	}
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp158_ = _tmp155_;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp158_) {
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp154_ = TRUE;
+#line 5286 "page-view.c"
+	} else {
+		CropLocation _tmp159_ = 0;
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp115_ = self->priv->crop_location;
+		_tmp159_ = self->priv->crop_location;
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp115_ == CROP_LOCATION_MIDDLE) {
-#line 5127 "page-view.c"
-		gint _tmp116_;
-		gint _tmp117_;
-		gint _tmp118_;
-		gint _tmp119_;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp116_ = new_x;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp117_ = dx;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_x = _tmp116_ + _tmp117_;
+		_tmp154_ = _tmp159_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 5293 "page-view.c"
+	}
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp160_ = _tmp154_;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp160_) {
+#line 5299 "page-view.c"
+		gint _tmp161_ = 0;
+		gint _tmp162_ = 0;
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp161_ = new_h;
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp162_ = dy;
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		new_h = _tmp161_ + _tmp162_;
+#line 5308 "page-view.c"
+	}
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp118_ = new_y;
+	_tmp163_ = self->priv->_page;
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp119_ = dy;
+	_tmp164_ = new_x;
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_y = _tmp118_ + _tmp119_;
-#line 5144 "page-view.c"
-	}
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp122_ = self->priv->crop_location;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp122_ == CROP_LOCATION_TOP_LEFT) {
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp121_ = TRUE;
-#line 5152 "page-view.c"
+	_tmp165_ = new_y;
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	page_move_crop (_tmp163_, _tmp164_, _tmp165_);
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp167_ = new_w;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp168_ = cw;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp167_ != _tmp168_) {
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp166_ = TRUE;
+#line 5326 "page-view.c"
 	} else {
-		CropLocation _tmp123_;
+		gint _tmp169_ = 0;
+		gint _tmp170_ = 0;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp169_ = new_h;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp123_ = self->priv->crop_location;
+		_tmp170_ = ch;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp121_ = _tmp123_ == CROP_LOCATION_LEFT;
-#line 5159 "page-view.c"
+		_tmp166_ = _tmp169_ != _tmp170_;
+#line 5336 "page-view.c"
 	}
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp124_ = _tmp121_;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp124_) {
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp120_ = TRUE;
-#line 5167 "page-view.c"
-	} else {
-		CropLocation _tmp125_;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp171_ = _tmp166_;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp171_) {
+#line 5342 "page-view.c"
+		Page* _tmp172_ = NULL;
+		gint _tmp173_ = 0;
+		gint _tmp174_ = 0;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp125_ = self->priv->crop_location;
+		_tmp172_ = self->priv->_page;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp120_ = _tmp125_ == CROP_LOCATION_BOTTOM_LEFT;
-#line 5174 "page-view.c"
-	}
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp126_ = _tmp120_;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp126_) {
-#line 5180 "page-view.c"
-		gint _tmp127_;
-		gint _tmp128_;
-		gint _tmp129_;
-		gint _tmp130_;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp127_ = new_x;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp128_ = dx;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_x = _tmp127_ + _tmp128_;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp129_ = new_w;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp130_ = dx;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_w = _tmp129_ - _tmp130_;
-#line 5197 "page-view.c"
-	}
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp133_ = self->priv->crop_location;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp133_ == CROP_LOCATION_TOP_LEFT) {
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = TRUE;
-#line 5205 "page-view.c"
-	} else {
-		CropLocation _tmp134_;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = self->priv->crop_location;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = _tmp134_ == CROP_LOCATION_TOP;
-#line 5212 "page-view.c"
-	}
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp135_ = _tmp132_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp135_) {
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = TRUE;
-#line 5220 "page-view.c"
-	} else {
-		CropLocation _tmp136_;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp136_ = self->priv->crop_location;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = _tmp136_ == CROP_LOCATION_TOP_RIGHT;
-#line 5227 "page-view.c"
-	}
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp137_ = _tmp131_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp137_) {
-#line 5233 "page-view.c"
-		gint _tmp138_;
-		gint _tmp139_;
-		gint _tmp140_;
-		gint _tmp141_;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp138_ = new_y;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp139_ = dy;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_y = _tmp138_ + _tmp139_;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp140_ = new_h;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = dy;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_h = _tmp140_ - _tmp141_;
-#line 5250 "page-view.c"
-	}
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp144_ = self->priv->crop_location;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp144_ == CROP_LOCATION_TOP_RIGHT) {
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = TRUE;
-#line 5258 "page-view.c"
-	} else {
-		CropLocation _tmp145_;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = self->priv->crop_location;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = _tmp145_ == CROP_LOCATION_RIGHT;
-#line 5265 "page-view.c"
-	}
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp146_ = _tmp143_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp146_) {
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp142_ = TRUE;
-#line 5273 "page-view.c"
-	} else {
-		CropLocation _tmp147_;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp147_ = self->priv->crop_location;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp142_ = _tmp147_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 5280 "page-view.c"
-	}
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp148_ = _tmp142_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp148_) {
-#line 5286 "page-view.c"
-		gint _tmp149_;
-		gint _tmp150_;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp149_ = new_w;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = dx;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_w = _tmp149_ + _tmp150_;
-#line 5295 "page-view.c"
-	}
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp153_ = self->priv->crop_location;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp153_ == CROP_LOCATION_BOTTOM_LEFT) {
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp152_ = TRUE;
-#line 5303 "page-view.c"
-	} else {
-		CropLocation _tmp154_;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = self->priv->crop_location;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp152_ = _tmp154_ == CROP_LOCATION_BOTTOM;
-#line 5310 "page-view.c"
-	}
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp155_ = _tmp152_;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp155_) {
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp151_ = TRUE;
-#line 5318 "page-view.c"
-	} else {
-		CropLocation _tmp156_;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp156_ = self->priv->crop_location;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp151_ = _tmp156_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 5325 "page-view.c"
-	}
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp157_ = _tmp151_;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp157_) {
-#line 5331 "page-view.c"
-		gint _tmp158_;
-		gint _tmp159_;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp158_ = new_h;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp159_ = dy;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_h = _tmp158_ + _tmp159_;
-#line 5340 "page-view.c"
-	}
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp160_ = self->priv->page;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp161_ = new_x;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp162_ = new_y;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_move_crop (_tmp160_, _tmp161_, _tmp162_);
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp164_ = new_w;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp165_ = cw;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp164_ != _tmp165_) {
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp163_ = TRUE;
-#line 5358 "page-view.c"
-	} else {
-		gint _tmp166_;
-		gint _tmp167_;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp166_ = new_h;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp167_ = ch;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp163_ = _tmp166_ != _tmp167_;
-#line 5368 "page-view.c"
-	}
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp168_ = _tmp163_;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp168_) {
-#line 5374 "page-view.c"
-		Page* _tmp169_;
-		gint _tmp170_;
-		gint _tmp171_;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp169_ = self->priv->page;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp170_ = new_w;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp171_ = new_h;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_set_custom_crop (_tmp169_, _tmp170_, _tmp171_);
-#line 5386 "page-view.c"
+		_tmp173_ = new_w;
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp174_ = new_h;
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		page_set_custom_crop (_tmp172_, _tmp173_, _tmp174_);
+#line 5354 "page-view.c"
 	}
 }
 
 
 void page_view_button_release (PageView* self, gint x, gint y) {
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->crop_location = CROP_LOCATION_NONE;
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 5398 "page-view.c"
-}
-
-
-GdkCursorType page_view_get_cursor (PageView* self) {
-	GdkCursorType result = 0;
-	GdkCursorType _tmp0_;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->cursor;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 5413 "page-view.c"
+#line 5366 "page-view.c"
 }
 
 
 static gboolean page_view_animation_cb (PageView* self) {
 	gboolean result = FALSE;
-	gint _tmp0_;
-	gint _tmp1_;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->animate_segment;
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->animate_n_segments;
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->animate_segment = (_tmp0_ + 1) % _tmp1_;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = TRUE;
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 5435 "page-view.c"
+#line 5388 "page-view.c"
 }
 
 
 static gboolean _page_view_animation_cb_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_view_animation_cb (self);
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 5444 "page-view.c"
+#line 5397 "page-view.c"
 }
 
 
@@ -5448,1091 +5401,1383 @@ static void page_view_update_animation (PageView* self) {
 	gboolean animate = FALSE;
 	gboolean is_animating = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Page* _tmp1_;
+	Page* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp5_;
-	guint _tmp6_;
-	gboolean _tmp7_;
-	gboolean _tmp8_;
-	gboolean _tmp9_;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+	guint _tmp8_ = 0U;
+	gboolean _tmp9_ = FALSE;
+	gboolean _tmp10_ = FALSE;
+	gboolean _tmp11_ = FALSE;
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->page;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_is_scanning (_tmp1_);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp2_) {
-#line 5467 "page-view.c"
-		Page* _tmp3_;
-		gboolean _tmp4_ = FALSE;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp3_ = self->priv->page;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp4_ = page_has_data (_tmp3_);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = !_tmp4_;
-#line 5476 "page-view.c"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = page_get_is_scanning (_tmp1_);
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp3_) {
+#line 5423 "page-view.c"
+		Page* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp4_ = self->priv->_page;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp5_ = page_get_has_data (_tmp4_);
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp6_ = _tmp5_;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp0_ = !_tmp6_;
+#line 5435 "page-view.c"
 	} else {
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = FALSE;
-#line 5480 "page-view.c"
+#line 5439 "page-view.c"
 	}
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = _tmp0_;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	animate = _tmp5_;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->animate_timeout;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	is_animating = _tmp6_ != ((guint) 0);
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = animate;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = is_animating;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp7_ == _tmp8_) {
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp7_ = _tmp0_;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	animate = _tmp7_;
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = self->priv->animate_timeout;
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	is_animating = _tmp8_ != ((guint) 0);
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = animate;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp10_ = is_animating;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp9_ == _tmp10_) {
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 5498 "page-view.c"
+#line 5457 "page-view.c"
 	}
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = animate;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp9_) {
-#line 5504 "page-view.c"
-		guint _tmp10_;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp11_ = animate;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp11_) {
+#line 5463 "page-view.c"
+		guint _tmp12_ = 0U;
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_segment = 0;
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = self->priv->animate_timeout;
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp10_ == ((guint) 0)) {
-#line 5512 "page-view.c"
-			guint _tmp11_ = 0U;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp11_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			self->priv->animate_timeout = _tmp11_;
-#line 5518 "page-view.c"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp12_ = self->priv->animate_timeout;
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp12_ == ((guint) 0)) {
+#line 5471 "page-view.c"
+			guint _tmp13_ = 0U;
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp13_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			self->priv->animate_timeout = _tmp13_;
+#line 5477 "page-view.c"
 		}
 	} else {
-		guint _tmp12_;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp12_ = self->priv->animate_timeout;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp12_ != ((guint) 0)) {
-#line 5526 "page-view.c"
-			guint _tmp13_;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp13_ = self->priv->animate_timeout;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			g_source_remove (_tmp13_);
-#line 5532 "page-view.c"
+		guint _tmp14_ = 0U;
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp14_ = self->priv->animate_timeout;
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp14_ != ((guint) 0)) {
+#line 5485 "page-view.c"
+			guint _tmp15_ = 0U;
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp15_ = self->priv->animate_timeout;
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			g_source_remove (_tmp15_);
+#line 5491 "page-view.c"
 		}
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_timeout = (guint) 0;
-#line 5536 "page-view.c"
+#line 5495 "page-view.c"
 	}
 }
 
 
 void page_view_render (PageView* self, cairo_t* context) {
+	gint w = 0;
 	gint _tmp0_ = 0;
-	gint w;
+	gint h = 0;
 	gint _tmp1_ = 0;
-	gint h;
-	cairo_t* _tmp2_;
-	cairo_t* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	cairo_t* _tmp6_;
-	cairo_t* _tmp7_;
-	gint _tmp8_;
-	cairo_t* _tmp9_;
-	gint _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	cairo_t* _tmp16_;
-	cairo_t* _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-	cairo_t* _tmp20_;
-	GdkPixbuf* _tmp21_;
-	cairo_t* _tmp22_;
+	cairo_t* _tmp2_ = NULL;
+	cairo_t* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	cairo_t* _tmp6_ = NULL;
+	cairo_t* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	cairo_t* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	gint _tmp12_ = 0;
+	gint _tmp13_ = 0;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+	cairo_t* _tmp16_ = NULL;
+	cairo_t* _tmp17_ = NULL;
+	gint _tmp18_ = 0;
+	gint _tmp19_ = 0;
+	cairo_t* _tmp20_ = NULL;
+	GdkPixbuf* _tmp21_ = NULL;
+	cairo_t* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-	Page* _tmp24_;
+	Page* _tmp24_ = NULL;
 	gboolean _tmp25_ = FALSE;
-	gboolean _tmp28_;
-	gboolean _tmp70_ = FALSE;
-	Page* _tmp71_;
+	gboolean _tmp26_ = FALSE;
+	gboolean _tmp30_ = FALSE;
 	gboolean _tmp72_ = FALSE;
-	gboolean _tmp75_;
-	Page* _tmp115_;
-	gboolean _tmp116_ = FALSE;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	Page* _tmp73_ = NULL;
+	gboolean _tmp74_ = FALSE;
+	gboolean _tmp75_ = FALSE;
+	gboolean _tmp79_ = FALSE;
+	Page* _tmp121_ = NULL;
+	gboolean _tmp122_ = FALSE;
+	gboolean _tmp123_ = FALSE;
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (context != NULL);
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_animation (self);
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_page_view (self);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page_view_get_preview_width (self);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	w = _tmp0_;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_height (self);
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	h = _tmp1_;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = context;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_line_width (_tmp2_, (gdouble) 1);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = context;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->x_offset;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = self->priv->y_offset;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = self->priv->_x_offset;
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = self->priv->_y_offset;
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_translate (_tmp3_, (gdouble) _tmp4_, (gdouble) _tmp5_);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = context;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_source_rgb (_tmp6_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = context;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->border_width;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_line_width (_tmp7_, (gdouble) _tmp8_);
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = context;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = self->priv->border_width;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = self->priv->border_width;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = self->priv->width;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = self->priv->border_width;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = self->priv->height;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = self->priv->border_width;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_rectangle (_tmp9_, ((gdouble) _tmp10_) / 2, ((gdouble) _tmp11_) / 2, (gdouble) (_tmp12_ - _tmp13_), (gdouble) (_tmp14_ - _tmp15_));
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = context;
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_stroke (_tmp16_);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = context;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = self->priv->border_width;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = self->priv->border_width;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_translate (_tmp17_, (gdouble) _tmp18_, (gdouble) _tmp19_);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = context;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = self->priv->image;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	gdk_cairo_set_source_pixbuf (_tmp20_, _tmp21_, (gdouble) 0, (gdouble) 0);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = context;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_paint (_tmp22_);
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = self->priv->page;
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp25_ = page_is_scanning (_tmp24_);
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp25_) {
-#line 5659 "page-view.c"
-		Page* _tmp26_;
-		gboolean _tmp27_ = FALSE;
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp26_ = self->priv->page;
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = page_has_data (_tmp26_);
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp23_ = !_tmp27_;
-#line 5668 "page-view.c"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp24_ = self->priv->_page;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp25_ = page_get_is_scanning (_tmp24_);
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp26_ = _tmp25_;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp26_) {
+#line 5623 "page-view.c"
+		Page* _tmp27_ = NULL;
+		gboolean _tmp28_ = FALSE;
+		gboolean _tmp29_ = FALSE;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp27_ = self->priv->_page;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp28_ = page_get_has_data (_tmp27_);
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp29_ = _tmp28_;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp23_ = !_tmp29_;
+#line 5635 "page-view.c"
 	} else {
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = FALSE;
-#line 5672 "page-view.c"
+#line 5639 "page-view.c"
 	}
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp28_ = _tmp23_;
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp28_) {
-#line 5678 "page-view.c"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp30_ = _tmp23_;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp30_) {
+#line 5645 "page-view.c"
 		gdouble outer_radius = 0.0;
-		gint _tmp29_;
-		gint _tmp30_;
-		gint _tmp33_;
-		gdouble arc;
-		gdouble _tmp34_;
-		gdouble _tmp35_;
+		gint _tmp31_ = 0;
+		gint _tmp32_ = 0;
+		gdouble arc = 0.0;
+		gint _tmp35_ = 0;
+		gdouble x = 0.0;
 		gdouble _tmp36_ = 0.0;
-		gdouble x;
-		gdouble _tmp37_;
-		gdouble _tmp38_;
+		gdouble _tmp37_ = 0.0;
+		gdouble _tmp38_ = 0.0;
+		gdouble y = 0.0;
 		gdouble _tmp39_ = 0.0;
-		gdouble y;
-		gdouble _tmp40_;
-		gdouble _tmp41_;
-		gdouble _tmp42_;
-		gdouble _tmp43_;
+		gdouble _tmp40_ = 0.0;
+		gdouble _tmp41_ = 0.0;
+		gdouble inner_radius = 0.0;
+		gdouble _tmp42_ = 0.0;
+		gdouble _tmp43_ = 0.0;
 		gdouble _tmp44_ = 0.0;
-		gdouble inner_radius;
-		gdouble offset;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = w;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp30_ = h;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp29_ > _tmp30_) {
-#line 5705 "page-view.c"
-			gint _tmp31_;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp31_ = w;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			outer_radius = 0.15 * _tmp31_;
-#line 5711 "page-view.c"
+		gdouble _tmp45_ = 0.0;
+		gdouble _tmp46_ = 0.0;
+		gdouble offset = 0.0;
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp31_ = w;
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp32_ = h;
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (_tmp31_ > _tmp32_) {
+#line 5672 "page-view.c"
+			gint _tmp33_ = 0;
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp33_ = w;
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			outer_radius = 0.15 * _tmp33_;
+#line 5678 "page-view.c"
 		} else {
-			gint _tmp32_;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp32_ = h;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			outer_radius = 0.15 * _tmp32_;
-#line 5718 "page-view.c"
+			gint _tmp34_ = 0;
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp34_ = h;
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			outer_radius = 0.15 * _tmp34_;
+#line 5685 "page-view.c"
 		}
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp33_ = self->priv->animate_n_segments;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		arc = G_PI / _tmp33_;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = outer_radius;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = arc;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = sin (_tmp35_);
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp34_ * _tmp36_;
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp37_ = outer_radius;
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = arc;
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = cos (_tmp38_);
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp37_ * (_tmp39_ - 1.0);
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = x;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = x;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = y;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = y;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = sqrt ((_tmp40_ * _tmp41_) + (_tmp42_ * _tmp43_));
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		inner_radius = 0.6 * _tmp44_;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp35_ = self->priv->animate_n_segments;
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		arc = G_PI / _tmp35_;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp36_ = outer_radius;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp37_ = arc;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp38_ = sin (_tmp37_);
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		x = _tmp36_ * _tmp38_;
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp39_ = outer_radius;
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp40_ = arc;
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp41_ = cos (_tmp40_);
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		y = _tmp39_ * (_tmp41_ - 1.0);
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp42_ = x;
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp43_ = x;
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp44_ = y;
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp45_ = y;
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp46_ = sqrt ((_tmp42_ * _tmp43_) + (_tmp44_ * _tmp45_));
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		inner_radius = 0.6 * _tmp46_;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		offset = 0.0;
-#line 5754 "page-view.c"
+#line 5721 "page-view.c"
 		{
-			gint i;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			gint i = 0;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			i = 0;
-#line 5759 "page-view.c"
+#line 5726 "page-view.c"
 			{
-				gboolean _tmp45_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp45_ = TRUE;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				gboolean _tmp47_ = FALSE;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp47_ = TRUE;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
-#line 5766 "page-view.c"
-					gboolean _tmp46_;
-					gint _tmp50_;
-					gint _tmp51_;
-					gint _tmp52_;
-					gdouble _tmp53_;
-					gdouble _tmp54_;
+#line 5733 "page-view.c"
+					gboolean _tmp48_ = FALSE;
+					gint _tmp52_ = 0;
+					gint _tmp53_ = 0;
+					gint _tmp54_ = 0;
 					gdouble _tmp55_ = 0.0;
-					gint _tmp56_;
-					gdouble _tmp57_;
-					gdouble _tmp58_;
+					gdouble _tmp56_ = 0.0;
+					gdouble _tmp57_ = 0.0;
+					gint _tmp58_ = 0;
 					gdouble _tmp59_ = 0.0;
-					cairo_t* _tmp60_;
-					gdouble _tmp61_;
-					gdouble _tmp62_;
-					gdouble _tmp63_;
-					gint _tmp64_;
-					gint _tmp65_;
-					cairo_t* _tmp68_;
-					cairo_t* _tmp69_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp46_ = _tmp45_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!_tmp46_) {
-#line 5790 "page-view.c"
-						gint _tmp47_;
-						gdouble _tmp48_;
-						gdouble _tmp49_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp47_ = i;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						i = _tmp47_ + 1;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp48_ = offset;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp49_ = arc;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						offset = _tmp48_ + (_tmp49_ * 2);
-#line 5804 "page-view.c"
+					gdouble _tmp60_ = 0.0;
+					gdouble _tmp61_ = 0.0;
+					cairo_t* _tmp62_ = NULL;
+					gdouble _tmp63_ = 0.0;
+					gdouble _tmp64_ = 0.0;
+					gdouble _tmp65_ = 0.0;
+					gint _tmp66_ = 0;
+					gint _tmp67_ = 0;
+					cairo_t* _tmp70_ = NULL;
+					cairo_t* _tmp71_ = NULL;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp48_ = _tmp47_;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					if (!_tmp48_) {
+#line 5757 "page-view.c"
+						gint _tmp49_ = 0;
+						gdouble _tmp50_ = 0.0;
+						gdouble _tmp51_ = 0.0;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp49_ = i;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						i = _tmp49_ + 1;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp50_ = offset;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp51_ = arc;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						offset = _tmp50_ + (_tmp51_ * 2);
+#line 5771 "page-view.c"
 					}
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp45_ = FALSE;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp50_ = i;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp51_ = self->priv->animate_n_segments;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!(_tmp50_ < _tmp51_)) {
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp47_ = FALSE;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp52_ = i;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp53_ = self->priv->animate_n_segments;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					if (!(_tmp52_ < _tmp53_)) {
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
-#line 5816 "page-view.c"
+#line 5783 "page-view.c"
 					}
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp54_ = w;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp55_ = outer_radius;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp56_ = offset;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp57_ = sin (_tmp56_);
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					x = (_tmp54_ / 2) + (_tmp55_ * _tmp57_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp58_ = h;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp59_ = outer_radius;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp60_ = offset;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp61_ = cos (_tmp60_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					y = (_tmp58_ / 2) - (_tmp59_ * _tmp61_);
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp62_ = context;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp63_ = x;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp64_ = y;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp65_ = inner_radius;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					cairo_arc (_tmp62_, _tmp63_, _tmp64_, _tmp65_, (gdouble) 0, 2 * G_PI);
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp66_ = i;
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp67_ = self->priv->animate_segment;
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					if (_tmp66_ == _tmp67_) {
+#line 5821 "page-view.c"
+						cairo_t* _tmp68_ = NULL;
+						cairo_t* _tmp69_ = NULL;
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp68_ = context;
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						cairo_set_source_rgb (_tmp68_, 0.75, 0.75, 0.75);
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						_tmp69_ = context;
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+						cairo_fill_preserve (_tmp69_);
+#line 5832 "page-view.c"
+					}
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp70_ = context;
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					cairo_set_source_rgb (_tmp70_, 0.5, 0.5, 0.5);
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					_tmp71_ = context;
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+					cairo_stroke (_tmp71_);
+#line 5842 "page-view.c"
+				}
+			}
+		}
+	}
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp73_ = self->priv->_page;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp74_ = page_get_is_scanning (_tmp73_);
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp75_ = _tmp74_;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp75_) {
+#line 5855 "page-view.c"
+		Page* _tmp76_ = NULL;
+		gint _tmp77_ = 0;
+		gint _tmp78_ = 0;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp76_ = self->priv->_page;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp77_ = page_get_scan_line (_tmp76_);
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp78_ = _tmp77_;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp72_ = _tmp78_ > 0;
+#line 5867 "page-view.c"
+	} else {
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp72_ = FALSE;
+#line 5871 "page-view.c"
+	}
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp79_ = _tmp72_;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp79_) {
+#line 5877 "page-view.c"
+		gint scan_line = 0;
+		Page* _tmp80_ = NULL;
+		gint _tmp81_ = 0;
+		gint _tmp82_ = 0;
+		gdouble s = 0.0;
+		gdouble x1 = 0.0;
+		gdouble y1 = 0.0;
+		gdouble x2 = 0.0;
+		gdouble y2 = 0.0;
+		Page* _tmp83_ = NULL;
+		ScanDirection _tmp84_ = 0;
+		ScanDirection _tmp85_ = 0;
+		cairo_t* _tmp113_ = NULL;
+		gdouble _tmp114_ = 0.0;
+		gdouble _tmp115_ = 0.0;
+		cairo_t* _tmp116_ = NULL;
+		gdouble _tmp117_ = 0.0;
+		gdouble _tmp118_ = 0.0;
+		cairo_t* _tmp119_ = NULL;
+		cairo_t* _tmp120_ = NULL;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp80_ = self->priv->_page;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp81_ = page_get_scan_line (_tmp80_);
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp82_ = _tmp81_;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		scan_line = _tmp82_;
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp83_ = self->priv->_page;
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp84_ = page_get_scan_direction (_tmp83_);
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp85_ = _tmp84_;
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		switch (_tmp85_) {
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 5916 "page-view.c"
+			{
+				gint _tmp86_ = 0;
+				gint _tmp87_ = 0;
+				gdouble _tmp88_ = 0.0;
+				gint _tmp89_ = 0;
+				gdouble _tmp90_ = 0.0;
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp86_ = scan_line;
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp87_ = page_view_page_to_screen_y (self, _tmp86_);
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				s = (gdouble) _tmp87_;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				x1 = (gdouble) 0;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp88_ = s;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y1 = _tmp88_ + 0.5;
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp89_ = w;
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				x2 = (gdouble) _tmp89_;
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp90_ = s;
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y2 = _tmp90_ + 0.5;
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				break;
+#line 5945 "page-view.c"
+			}
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 5949 "page-view.c"
+			{
+				gint _tmp91_ = 0;
+				gint _tmp92_ = 0;
+				gint _tmp93_ = 0;
+				gdouble _tmp94_ = 0.0;
+				gint _tmp95_ = 0;
+				gint _tmp96_ = 0;
+				gdouble _tmp97_ = 0.0;
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp91_ = scan_line;
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp92_ = page_view_page_to_screen_y (self, _tmp91_);
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				s = (gdouble) _tmp92_;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp52_ = w;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp53_ = outer_radius;
+				x1 = (gdouble) 0;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp54_ = offset;
+				_tmp93_ = h;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp55_ = sin (_tmp54_);
+				_tmp94_ = s;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = (_tmp52_ / 2) + (_tmp53_ * _tmp55_);
+				y1 = (_tmp93_ - _tmp94_) + 0.5;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp56_ = h;
+				_tmp95_ = w;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp57_ = outer_radius;
+				x2 = (gdouble) _tmp95_;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp58_ = offset;
+				_tmp96_ = h;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp59_ = cos (_tmp58_);
+				_tmp97_ = s;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = (_tmp56_ / 2) - (_tmp57_ * _tmp59_);
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp60_ = context;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp61_ = x;
+				y2 = (_tmp96_ - _tmp97_) + 0.5;
 #line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp62_ = y;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp63_ = inner_radius;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_arc (_tmp60_, _tmp61_, _tmp62_, _tmp63_, (gdouble) 0, 2 * G_PI);
+				break;
+#line 5984 "page-view.c"
+			}
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 5988 "page-view.c"
+			{
+				gint _tmp98_ = 0;
+				gint _tmp99_ = 0;
+				gdouble _tmp100_ = 0.0;
+				gdouble _tmp101_ = 0.0;
+				gint _tmp102_ = 0;
 #line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp64_ = i;
+				_tmp98_ = scan_line;
 #line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp65_ = self->priv->animate_segment;
+				_tmp99_ = page_view_page_to_screen_x (self, _tmp98_);
 #line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (_tmp64_ == _tmp65_) {
-#line 5854 "page-view.c"
-						cairo_t* _tmp66_;
-						cairo_t* _tmp67_;
+				s = (gdouble) _tmp99_;
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp100_ = s;
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				x1 = _tmp100_ + 0.5;
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y1 = (gdouble) 0;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp66_ = context;
+				_tmp101_ = s;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						cairo_set_source_rgb (_tmp66_, 0.75, 0.75, 0.75);
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp67_ = context;
+				x2 = _tmp101_ + 0.5;
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp102_ = h;
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y2 = (gdouble) _tmp102_;
 #line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						cairo_fill_preserve (_tmp67_);
-#line 5865 "page-view.c"
-					}
+				break;
+#line 6017 "page-view.c"
+			}
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 6021 "page-view.c"
+			{
+				gint _tmp103_ = 0;
+				gint _tmp104_ = 0;
+				gint _tmp105_ = 0;
+				gdouble _tmp106_ = 0.0;
+				gint _tmp107_ = 0;
+				gdouble _tmp108_ = 0.0;
+				gint _tmp109_ = 0;
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp103_ = scan_line;
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp104_ = page_view_page_to_screen_x (self, _tmp103_);
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				s = (gdouble) _tmp104_;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp105_ = w;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp68_ = context;
+				_tmp106_ = s;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_set_source_rgb (_tmp68_, 0.5, 0.5, 0.5);
+				x1 = (_tmp105_ - _tmp106_) + 0.5;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y1 = (gdouble) 0;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp69_ = context;
+				_tmp107_ = w;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_stroke (_tmp69_);
-#line 5875 "page-view.c"
-				}
+				_tmp108_ = s;
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				x2 = (_tmp107_ - _tmp108_) + 0.5;
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp109_ = h;
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y2 = (gdouble) _tmp109_;
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				break;
+#line 6056 "page-view.c"
+			}
+			default:
+			{
+				gdouble _tmp110_ = 0.0;
+				gdouble _tmp111_ = 0.0;
+				gdouble _tmp112_ = 0.0;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y2 = (gdouble) 0;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp110_ = y2;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				x2 = _tmp110_;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp111_ = x2;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				y1 = _tmp111_;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				_tmp112_ = y1;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				x1 = _tmp112_;
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+				break;
+#line 6079 "page-view.c"
 			}
 		}
-	}
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = self->priv->page;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = page_is_scanning (_tmp71_);
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp72_) {
-#line 5886 "page-view.c"
-		Page* _tmp73_;
-		gint _tmp74_ = 0;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp73_ = self->priv->page;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp74_ = page_get_scan_line (_tmp73_);
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = _tmp74_ > 0;
-#line 5895 "page-view.c"
-	} else {
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = FALSE;
-#line 5899 "page-view.c"
-	}
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = _tmp70_;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp75_) {
-#line 5905 "page-view.c"
-		Page* _tmp76_;
-		gint _tmp77_ = 0;
-		gint scan_line;
-		gdouble s = 0.0;
-		gdouble x1 = 0.0;
-		gdouble y1 = 0.0;
-		gdouble x2 = 0.0;
-		gdouble y2 = 0.0;
-		Page* _tmp78_;
-		ScanDirection _tmp79_ = 0;
-		cairo_t* _tmp107_;
-		gdouble _tmp108_;
-		gdouble _tmp109_;
-		cairo_t* _tmp110_;
-		gdouble _tmp111_;
-		gdouble _tmp112_;
-		cairo_t* _tmp113_;
-		cairo_t* _tmp114_;
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = self->priv->page;
+		_tmp113_ = context;
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp77_ = page_get_scan_line (_tmp76_);
+		_tmp114_ = x1;
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		scan_line = _tmp77_;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = self->priv->page;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp79_ = page_get_scan_direction (_tmp78_);
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		switch (_tmp79_) {
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 5938 "page-view.c"
-			{
-				gint _tmp80_;
-				gint _tmp81_ = 0;
-				gdouble _tmp82_;
-				gint _tmp83_;
-				gdouble _tmp84_;
+		_tmp115_ = y1;
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_move_to (_tmp113_, _tmp114_, _tmp115_);
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp116_ = context;
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp117_ = x2;
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp118_ = y2;
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_line_to (_tmp116_, _tmp117_, _tmp118_);
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp119_ = context;
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_set_source_rgb (_tmp119_, 1.0, 0.0, 0.0);
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp120_ = context;
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_stroke (_tmp120_);
+#line 6106 "page-view.c"
+	}
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp80_ = scan_line;
+	_tmp121_ = self->priv->_page;
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp81_ = page_view_page_to_screen_y (self, _tmp80_);
+	_tmp122_ = page_get_has_crop (_tmp121_);
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp81_;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (gdouble) 0;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp82_ = s;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = _tmp82_ + 0.5;
+	_tmp123_ = _tmp122_;
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp123_) {
+#line 6116 "page-view.c"
+		gint x = 0;
+		Page* _tmp124_ = NULL;
+		gint _tmp125_ = 0;
+		gint _tmp126_ = 0;
+		gint y = 0;
+		Page* _tmp127_ = NULL;
+		gint _tmp128_ = 0;
+		gint _tmp129_ = 0;
+		gint crop_width = 0;
+		Page* _tmp130_ = NULL;
+		gint _tmp131_ = 0;
+		gint _tmp132_ = 0;
+		gint crop_height = 0;
+		Page* _tmp133_ = NULL;
+		gint _tmp134_ = 0;
+		gint _tmp135_ = 0;
+		gint dx = 0;
+		gint _tmp136_ = 0;
+		gint _tmp137_ = 0;
+		gint dy = 0;
+		gint _tmp138_ = 0;
+		gint _tmp139_ = 0;
+		gint dw = 0;
+		gint _tmp140_ = 0;
+		gint _tmp141_ = 0;
+		gint dh = 0;
+		gint _tmp142_ = 0;
+		gint _tmp143_ = 0;
+		cairo_t* _tmp144_ = NULL;
+		gint _tmp145_ = 0;
+		gint _tmp146_ = 0;
+		cairo_t* _tmp147_ = NULL;
+		cairo_t* _tmp148_ = NULL;
+		gint _tmp149_ = 0;
+		gint _tmp150_ = 0;
+		gint _tmp151_ = 0;
+		gint _tmp152_ = 0;
+		cairo_t* _tmp153_ = NULL;
+		cairo_t* _tmp154_ = NULL;
+		cairo_t* _tmp155_ = NULL;
+		cairo_t* _tmp156_ = NULL;
+		gint _tmp157_ = 0;
+		gint _tmp158_ = 0;
+		gint _tmp159_ = 0;
+		gint _tmp160_ = 0;
+		cairo_t* _tmp161_ = NULL;
+		cairo_t* _tmp162_ = NULL;
+		cairo_t* _tmp163_ = NULL;
+		gint _tmp164_ = 0;
+		gint _tmp165_ = 0;
+		gint _tmp166_ = 0;
+		gint _tmp167_ = 0;
+		cairo_t* _tmp168_ = NULL;
+		cairo_t* _tmp169_ = NULL;
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_ = w;
+		_tmp124_ = self->priv->_page;
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (gdouble) _tmp83_;
+		_tmp125_ = page_get_crop_x (_tmp124_);
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84_ = s;
+		_tmp126_ = _tmp125_;
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = _tmp84_ + 0.5;
+		x = _tmp126_;
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 5967 "page-view.c"
-			}
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 5971 "page-view.c"
-			{
-				gint _tmp85_;
-				gint _tmp86_ = 0;
-				gint _tmp87_;
-				gdouble _tmp88_;
-				gint _tmp89_;
-				gint _tmp90_;
-				gdouble _tmp91_;
+		_tmp127_ = self->priv->_page;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp128_ = page_get_crop_y (_tmp127_);
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp129_ = _tmp128_;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		y = _tmp129_;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp130_ = self->priv->_page;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp131_ = page_get_crop_width (_tmp130_);
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp132_ = _tmp131_;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		crop_width = _tmp132_;
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85_ = scan_line;
+		_tmp133_ = self->priv->_page;
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp86_ = page_view_page_to_screen_y (self, _tmp85_);
+		_tmp134_ = page_get_crop_height (_tmp133_);
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp86_;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (gdouble) 0;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp87_ = h;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp88_ = s;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (_tmp87_ - _tmp88_) + 0.5;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp89_ = w;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (gdouble) _tmp89_;
+		_tmp135_ = _tmp134_;
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		crop_height = _tmp135_;
 #line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp90_ = h;
+		_tmp136_ = x;
 #line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp91_ = s;
+		_tmp137_ = page_view_page_to_screen_x (self, _tmp136_);
 #line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (_tmp90_ - _tmp91_) + 0.5;
+		dx = _tmp137_;
 #line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 6006 "page-view.c"
-			}
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 6010 "page-view.c"
-			{
-				gint _tmp92_;
-				gint _tmp93_ = 0;
-				gdouble _tmp94_;
-				gdouble _tmp95_;
-				gint _tmp96_;
+		_tmp138_ = y;
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp139_ = page_view_page_to_screen_y (self, _tmp138_);
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		dy = _tmp139_;
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp140_ = crop_width;
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp141_ = page_view_page_to_screen_x (self, _tmp140_);
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		dw = _tmp141_;
 #line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp92_ = scan_line;
+		_tmp142_ = crop_height;
 #line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp93_ = page_view_page_to_screen_x (self, _tmp92_);
+		_tmp143_ = page_view_page_to_screen_y (self, _tmp142_);
 #line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp93_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp94_ = s;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = _tmp94_ + 0.5;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (gdouble) 0;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp95_ = s;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = _tmp95_ + 0.5;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp96_ = h;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) _tmp96_;
+		dh = _tmp143_;
 #line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 6039 "page-view.c"
-			}
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 6043 "page-view.c"
-			{
-				gint _tmp97_;
-				gint _tmp98_ = 0;
-				gint _tmp99_;
-				gdouble _tmp100_;
-				gint _tmp101_;
-				gdouble _tmp102_;
-				gint _tmp103_;
+		_tmp144_ = context;
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp145_ = w;
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp146_ = h;
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_rectangle (_tmp144_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp145_, (gdouble) _tmp146_);
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp147_ = context;
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_new_sub_path (_tmp147_);
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp97_ = scan_line;
+		_tmp148_ = context;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp98_ = page_view_page_to_screen_x (self, _tmp97_);
+		_tmp149_ = dx;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp98_;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp99_ = w;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp100_ = s;
+		_tmp150_ = dy;
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp151_ = dw;
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp152_ = dh;
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_rectangle (_tmp148_, (gdouble) _tmp149_, (gdouble) _tmp150_, (gdouble) _tmp151_, (gdouble) _tmp152_);
 #line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (_tmp99_ - _tmp100_) + 0.5;
+		_tmp153_ = context;
 #line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (gdouble) 0;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp101_ = w;
+		cairo_set_fill_rule (_tmp153_, CAIRO_FILL_RULE_EVEN_ODD);
 #line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp102_ = s;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (_tmp101_ - _tmp102_) + 0.5;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp103_ = h;
+		_tmp154_ = context;
 #line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) _tmp103_;
+		cairo_set_source_rgba (_tmp154_, 0.25, 0.25, 0.25, 0.2);
 #line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 6078 "page-view.c"
-			}
-			default:
-			{
-				gdouble _tmp104_;
-				gdouble _tmp105_;
-				gdouble _tmp106_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) 0;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp104_ = y2;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = _tmp104_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp105_ = x2;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = _tmp105_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp106_ = y1;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = _tmp106_;
+		_tmp155_ = context;
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_fill (_tmp155_);
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				break;
-#line 6101 "page-view.c"
-			}
-		}
+		_tmp156_ = context;
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp157_ = dx;
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp158_ = dy;
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp159_ = dw;
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp160_ = dh;
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_rectangle (_tmp156_, _tmp157_ - 1.5, _tmp158_ - 1.5, (gdouble) (_tmp159_ + 3), (gdouble) (_tmp160_ + 3));
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp161_ = context;
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_set_source_rgb (_tmp161_, 1.0, 1.0, 1.0);
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp162_ = context;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_stroke (_tmp162_);
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp107_ = context;
+		_tmp163_ = context;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp108_ = x1;
+		_tmp164_ = dx;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp109_ = y1;
+		_tmp165_ = dy;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_move_to (_tmp107_, _tmp108_, _tmp109_);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp110_ = context;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp111_ = x2;
+		_tmp166_ = dw;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp167_ = dh;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		cairo_rectangle (_tmp163_, _tmp164_ - 0.5, _tmp165_ - 0.5, (gdouble) (_tmp166_ + 1), (gdouble) (_tmp167_ + 1));
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp112_ = y2;
+		_tmp168_ = context;
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_line_to (_tmp110_, _tmp111_, _tmp112_);
+		cairo_set_source_rgb (_tmp168_, 0.0, 0.0, 0.0);
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp113_ = context;
+		_tmp169_ = context;
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp113_, 1.0, 0.0, 0.0);
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp114_ = context;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp114_);
-#line 6128 "page-view.c"
-	}
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp115_ = self->priv->page;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp116_ = page_has_crop (_tmp115_);
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp116_) {
-#line 6136 "page-view.c"
-		gint x = 0;
-		gint y = 0;
-		gint crop_width = 0;
-		gint crop_height = 0;
-		Page* _tmp117_;
-		gint _tmp118_ = 0;
-		gint _tmp119_ = 0;
-		gint _tmp120_ = 0;
-		gint _tmp121_ = 0;
-		gint _tmp122_;
-		gint _tmp123_ = 0;
-		gint dx;
-		gint _tmp124_;
-		gint _tmp125_ = 0;
-		gint dy;
-		gint _tmp126_;
-		gint _tmp127_ = 0;
-		gint dw;
-		gint _tmp128_;
-		gint _tmp129_ = 0;
-		gint dh;
-		cairo_t* _tmp130_;
-		gint _tmp131_;
-		gint _tmp132_;
-		cairo_t* _tmp133_;
-		cairo_t* _tmp134_;
-		gint _tmp135_;
-		gint _tmp136_;
-		gint _tmp137_;
-		gint _tmp138_;
-		cairo_t* _tmp139_;
-		cairo_t* _tmp140_;
-		cairo_t* _tmp141_;
-		cairo_t* _tmp142_;
-		gint _tmp143_;
-		gint _tmp144_;
-		gint _tmp145_;
-		gint _tmp146_;
-		cairo_t* _tmp147_;
-		cairo_t* _tmp148_;
-		cairo_t* _tmp149_;
-		gint _tmp150_;
-		gint _tmp151_;
-		gint _tmp152_;
-		gint _tmp153_;
-		cairo_t* _tmp154_;
-		cairo_t* _tmp155_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp117_ = self->priv->page;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_get_crop (_tmp117_, &_tmp118_, &_tmp119_, &_tmp120_, &_tmp121_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp118_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp119_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_width = _tmp120_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_height = _tmp121_;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp122_ = x;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp123_ = page_view_page_to_screen_x (self, _tmp122_);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dx = _tmp123_;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = y;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp125_ = page_view_page_to_screen_y (self, _tmp124_);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dy = _tmp125_;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp126_ = crop_width;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp127_ = page_view_page_to_screen_x (self, _tmp126_);
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dw = _tmp127_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp128_ = crop_height;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp129_ = page_view_page_to_screen_y (self, _tmp128_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dh = _tmp129_;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp130_ = context;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = w;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = h;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp130_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp131_, (gdouble) _tmp132_);
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp133_ = context;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_new_sub_path (_tmp133_);
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = context;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp135_ = dx;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp136_ = dy;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp137_ = dw;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp138_ = dh;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp134_, (gdouble) _tmp135_, (gdouble) _tmp136_, (gdouble) _tmp137_, (gdouble) _tmp138_);
-#line 967 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp139_ = context;
-#line 967 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_fill_rule (_tmp139_, CAIRO_FILL_RULE_EVEN_ODD);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp140_ = context;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgba (_tmp140_, 0.25, 0.25, 0.25, 0.2);
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = context;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_fill (_tmp141_);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp142_ = context;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = dx;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp144_ = dy;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = dw;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp146_ = dh;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp142_, _tmp143_ - 1.5, _tmp144_ - 1.5, (gdouble) (_tmp145_ + 3), (gdouble) (_tmp146_ + 3));
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp147_ = context;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp147_, 1.0, 1.0, 1.0);
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp148_ = context;
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp148_);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp149_ = context;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = dx;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp151_ = dy;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp152_ = dw;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp153_ = dh;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp149_, _tmp150_ - 0.5, _tmp151_ - 0.5, (gdouble) (_tmp152_ + 1), (gdouble) (_tmp153_ + 1));
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = context;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp154_, 0.0, 0.0, 0.0);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp155_ = context;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp155_);
-#line 6296 "page-view.c"
+		cairo_stroke (_tmp169_);
+#line 6303 "page-view.c"
 	}
 }
 
 
 void page_view_set_width (PageView* self, gint width) {
-	gint _tmp0_;
-	Page* _tmp1_;
+	gint height = 0;
+	gint _tmp0_ = 0;
+	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-	Page* _tmp3_;
-	gint _tmp4_ = 0;
-	gint height;
-	gboolean _tmp5_ = FALSE;
-	gint _tmp6_;
-	gint _tmp7_;
-	gboolean _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp3_ = 0;
+	Page* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	gboolean _tmp7_ = FALSE;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+	gboolean _tmp12_ = FALSE;
+	gint _tmp13_ = 0;
+	gint _tmp14_ = 0;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = width;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->page;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_height (_tmp1_);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = self->priv->page;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page_get_width (_tmp3_);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	height = (gint) ((((gdouble) _tmp0_) * _tmp2_) / _tmp4_);
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->width;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = width;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp6_ == _tmp7_) {
-#line 6334 "page-view.c"
-		gint _tmp8_;
-		gint _tmp9_;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = self->priv->height;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = height;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = _tmp8_ == _tmp9_;
-#line 6343 "page-view.c"
-	} else {
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = FALSE;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = self->priv->_page;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = page_get_width (_tmp4_);
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = _tmp5_;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	height = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = self->priv->width;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = width;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp8_ == _tmp9_) {
 #line 6347 "page-view.c"
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp10_ = self->priv->height;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = height;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = _tmp10_ == _tmp11_;
+#line 6356 "page-view.c"
+	} else {
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = FALSE;
+#line 6360 "page-view.c"
 	}
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = _tmp5_;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_) {
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = _tmp7_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp12_) {
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 6355 "page-view.c"
+#line 6368 "page-view.c"
 	}
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = width;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->width = _tmp11_;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = height;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->height = _tmp12_;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = width;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->width = _tmp13_;
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp14_ = height;
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->height = _tmp14_;
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6371 "page-view.c"
+#line 6384 "page-view.c"
 }
 
 
 void page_view_set_height (PageView* self, gint height) {
-	gint _tmp0_;
-	Page* _tmp1_;
+	gint width = 0;
+	gint _tmp0_ = 0;
+	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-	Page* _tmp3_;
-	gint _tmp4_ = 0;
-	gint width;
-	gboolean _tmp5_ = FALSE;
-	gint _tmp6_;
-	gint _tmp7_;
-	gboolean _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp3_ = 0;
+	Page* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	gboolean _tmp7_ = FALSE;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+	gboolean _tmp12_ = FALSE;
+	gint _tmp13_ = 0;
+	gint _tmp14_ = 0;
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = height;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->page;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_width (_tmp1_);
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = self->priv->page;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = page_get_height (_tmp3_);
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	width = (gint) ((((gdouble) _tmp0_) * _tmp2_) / _tmp4_);
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->width;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = width;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp6_ == _tmp7_) {
-#line 6408 "page-view.c"
-		gint _tmp8_;
-		gint _tmp9_;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = self->priv->height;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = height;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = _tmp8_ == _tmp9_;
-#line 6417 "page-view.c"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = self->priv->_page;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = page_get_height (_tmp4_);
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = _tmp5_;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	width = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = self->priv->width;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = width;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp8_ == _tmp9_) {
+#line 6427 "page-view.c"
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp10_ = self->priv->height;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = height;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = _tmp10_ == _tmp11_;
+#line 6436 "page-view.c"
 	} else {
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp5_ = FALSE;
-#line 6421 "page-view.c"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = FALSE;
+#line 6440 "page-view.c"
 	}
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = _tmp5_;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp10_) {
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = _tmp7_;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp12_) {
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 6429 "page-view.c"
+#line 6448 "page-view.c"
 	}
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = width;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->width = _tmp11_;
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = height;
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->height = _tmp12_;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = width;
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->width = _tmp13_;
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp14_ = height;
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->height = _tmp14_;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6445 "page-view.c"
+#line 6464 "page-view.c"
 }
 
 
 gint page_view_get_width (PageView* self) {
 	gint result = 0;
-	gint _tmp0_;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp0_ = 0;
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->width;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6460 "page-view.c"
+#line 6479 "page-view.c"
 }
 
 
 gint page_view_get_height (PageView* self) {
 	gint result = 0;
-	gint _tmp0_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	gint _tmp0_ = 0;
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->height;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6475 "page-view.c"
+#line 6494 "page-view.c"
 }
 
 
 static void page_view_page_pixels_changed_cb (PageView* self, Page* p) {
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6488 "page-view.c"
+#line 6507 "page-view.c"
 }
 
 
 static void page_view_page_size_changed_cb (PageView* self, Page* p) {
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6503 "page-view.c"
+#line 6522 "page-view.c"
 }
 
 
 static void page_view_page_overlay_changed_cb (PageView* self, Page* p) {
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6514 "page-view.c"
+#line 6533 "page-view.c"
 }
 
 
 static void page_view_scan_direction_changed_cb (PageView* self, Page* p) {
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_emit_by_name (self, "changed");
+#line 6548 "page-view.c"
+}
+
+
+Page* page_view_get_page (PageView* self) {
+	Page* result;
+	Page* _tmp0_ = NULL;
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->_page;
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6563 "page-view.c"
+}
+
+
+static gpointer _page_ref0 (gpointer self) {
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return self ? page_ref (self) : NULL;
+#line 6570 "page-view.c"
+}
+
+
+static void page_view_set_page (PageView* self, Page* value) {
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = value;
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = _page_ref0 (_tmp0_);
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_page_unref0 (self->priv->_page);
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->_page = _tmp1_;
+#line 6587 "page-view.c"
+}
+
+
+gboolean page_view_get_selected (PageView* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->selected_;
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6602 "page-view.c"
+}
+
+
+void page_view_set_selected (PageView* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp13_ = FALSE;
+	gboolean _tmp14_ = FALSE;
+	gboolean _tmp15_ = FALSE;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = page_view_get_selected (self);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp3_) {
+#line 6623 "page-view.c"
+		gboolean _tmp4_ = FALSE;
+		gboolean _tmp5_ = FALSE;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp4_ = page_view_get_selected (self);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp5_ = _tmp4_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp1_ = _tmp5_;
+#line 6632 "page-view.c"
+	} else {
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp1_ = FALSE;
+#line 6636 "page-view.c"
+	}
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = _tmp1_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp6_) {
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp0_ = TRUE;
+#line 6644 "page-view.c"
+	} else {
+		gboolean _tmp7_ = FALSE;
+		gboolean _tmp8_ = FALSE;
+		gboolean _tmp9_ = FALSE;
+		gboolean _tmp12_ = FALSE;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp8_ = page_view_get_selected (self);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp9_ = _tmp8_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		if (!_tmp9_) {
+#line 6656 "page-view.c"
+			gboolean _tmp10_ = FALSE;
+			gboolean _tmp11_ = FALSE;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp10_ = page_view_get_selected (self);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp11_ = _tmp10_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp7_ = !_tmp11_;
+#line 6665 "page-view.c"
+		} else {
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+			_tmp7_ = FALSE;
+#line 6669 "page-view.c"
+		}
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp12_ = _tmp7_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp0_ = _tmp12_;
+#line 6675 "page-view.c"
+	}
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = _tmp0_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp13_) {
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		return;
+#line 6683 "page-view.c"
+	}
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp14_ = page_view_get_selected (self);
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp15_ = _tmp14_;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	page_view_set_selected (self, _tmp15_);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6529 "page-view.c"
+#line 6693 "page-view.c"
+}
+
+
+gint page_view_get_x_offset (PageView* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->_x_offset;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6708 "page-view.c"
+}
+
+
+void page_view_set_x_offset (PageView* self, gint value) {
+	gint _tmp0_ = 0;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = value;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->_x_offset = _tmp0_;
+#line 6720 "page-view.c"
+}
+
+
+gint page_view_get_y_offset (PageView* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->_y_offset;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6735 "page-view.c"
+}
+
+
+void page_view_set_y_offset (PageView* self, gint value) {
+	gint _tmp0_ = 0;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = value;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->_y_offset = _tmp0_;
+#line 6747 "page-view.c"
+}
+
+
+GdkCursorType page_view_get_cursor (PageView* self) {
+	GdkCursorType result;
+	GdkCursorType _tmp0_ = 0;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->_cursor;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6762 "page-view.c"
+}
+
+
+static void page_view_set_cursor (PageView* self, GdkCursorType value) {
+	GdkCursorType _tmp0_ = 0;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = value;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->_cursor = _tmp0_;
+#line 6774 "page-view.c"
 }
 
 
 static void value_page_view_init (GValue* value) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	value->data[0].v_pointer = NULL;
-#line 6536 "page-view.c"
+#line 6781 "page-view.c"
 }
 
 
@@ -6541,7 +6786,7 @@ static void value_page_view_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (value->data[0].v_pointer);
-#line 6545 "page-view.c"
+#line 6790 "page-view.c"
 	}
 }
 
@@ -6551,11 +6796,11 @@ static void value_page_view_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = page_view_ref (src_value->data[0].v_pointer);
-#line 6555 "page-view.c"
+#line 6800 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6559 "page-view.c"
+#line 6804 "page-view.c"
 	}
 }
 
@@ -6563,37 +6808,37 @@ static void value_page_view_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_page_view_peek_pointer (const GValue* value) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
-#line 6567 "page-view.c"
+#line 6812 "page-view.c"
 }
 
 
 static gchar* value_page_view_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (collect_values[0].v_pointer) {
-#line 6574 "page-view.c"
+#line 6819 "page-view.c"
 		PageView* object;
 		object = collect_values[0].v_pointer;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6581 "page-view.c"
+#line 6826 "page-view.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6585 "page-view.c"
+#line 6830 "page-view.c"
 		}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = page_view_ref (object);
-#line 6589 "page-view.c"
+#line 6834 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
-#line 6593 "page-view.c"
+#line 6838 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
-#line 6597 "page-view.c"
+#line 6842 "page-view.c"
 }
 
 
@@ -6604,25 +6849,25 @@ static gchar* value_page_view_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6608 "page-view.c"
+#line 6853 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!value->data[0].v_pointer) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = NULL;
-#line 6614 "page-view.c"
+#line 6859 "page-view.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6618 "page-view.c"
+#line 6863 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = page_view_ref (value->data[0].v_pointer);
-#line 6622 "page-view.c"
+#line 6867 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
-#line 6626 "page-view.c"
+#line 6871 "page-view.c"
 }
 
 
@@ -6636,7 +6881,7 @@ GParamSpec* param_spec_page_view (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return G_PARAM_SPEC (spec);
-#line 6640 "page-view.c"
+#line 6885 "page-view.c"
 }
 
 
@@ -6645,7 +6890,7 @@ gpointer value_get_page_view (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW), NULL);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
-#line 6649 "page-view.c"
+#line 6894 "page-view.c"
 }
 
 
@@ -6665,17 +6910,17 @@ void value_set_page_view (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_ref (value->data[0].v_pointer);
-#line 6669 "page-view.c"
+#line 6914 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
-#line 6673 "page-view.c"
+#line 6918 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
-#line 6679 "page-view.c"
+#line 6924 "page-view.c"
 	}
 }
 
@@ -6694,17 +6939,17 @@ void value_take_page_view (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = v_object;
-#line 6698 "page-view.c"
+#line 6943 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
-#line 6702 "page-view.c"
+#line 6947 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
-#line 6708 "page-view.c"
+#line 6953 "page-view.c"
 	}
 }
 
@@ -6720,7 +6965,7 @@ static void page_view_class_init (PageViewClass * klass) {
 	g_signal_new ("size_changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_new ("changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6724 "page-view.c"
+#line 6969 "page-view.c"
 }
 
 
@@ -6729,69 +6974,71 @@ static void page_view_instance_init (PageView * self) {
 	self->priv = PAGE_VIEW_GET_PRIVATE (self);
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->image = NULL;
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->selected_ = FALSE;
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->border_width = 1;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->cursor = GDK_ARROW;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->_cursor = GDK_ARROW;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->animate_n_segments = 7;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->ref_count = 1;
-#line 6743 "page-view.c"
+#line 6990 "page-view.c"
 }
 
 
 static void page_view_finalize (PageView* obj) {
 	PageView * self;
-	Page* _tmp0_;
+	Page* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-	Page* _tmp2_;
+	Page* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-	Page* _tmp4_;
+	Page* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-	Page* _tmp6_;
+	Page* _tmp6_ = NULL;
 	guint _tmp7_ = 0U;
-	Page* _tmp8_;
+	Page* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_VIEW, PageView);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->page;
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->_page;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = self->priv->page;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = self->priv->_page;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->page;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = self->priv->_page;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = self->priv->page;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = self->priv->_page;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("scan-line-changed", TYPE_PAGE, &_tmp7_, NULL, FALSE);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->page;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = self->priv->_page;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp9_, NULL, FALSE);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
 #line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_page_unref0 (self->priv->page);
+	_page_unref0 (self->priv->_page);
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_object_unref0 (self->priv->image);
-#line 6795 "page-view.c"
+#line 7042 "page-view.c"
 }
 
 
@@ -6816,7 +7063,7 @@ gpointer page_view_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return instance;
-#line 6820 "page-view.c"
+#line 7067 "page-view.c"
 }
 
 
@@ -6829,7 +7076,7 @@ void page_view_unref (gpointer instance) {
 		PAGE_VIEW_GET_CLASS (self)->finalize (self);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6833 "page-view.c"
+#line 7080 "page-view.c"
 	}
 }
 
diff --git a/src/page-view.vala b/src/page-view.vala
index 7d228e4..7ea2082 100644
--- a/src/page-view.vala
+++ b/src/page-view.vala
@@ -26,13 +26,25 @@ public enum CropLocation
 public class PageView
 {
     /* Page being rendered */
-    private Page page;
+    public Page page { get; private set; }
 
     /* Image to render at current resolution */
     private Gdk.Pixbuf? image = null;
 
     /* Border around image */
-    private bool selected;
+    private bool selected_ = false;
+    public bool selected
+    {
+        get { return selected_; }
+        set    
+        {
+            if ((this.selected && selected) || (!this.selected && !selected))
+                return;
+            this.selected = selected;
+            changed ();
+        }
+    }
+
     private int border_width = 1;
 
     /* True if image needs to be regenerated */
@@ -49,8 +61,8 @@ public class PageView
     private int height;
 
     /* Location to place this page */
-    private int x_offset;
-    private int y_offset;
+    public int x_offset { get; set; }
+    public int y_offset { get; set; }
 
     private CropLocation crop_location;
     private double selected_crop_px;
@@ -61,7 +73,7 @@ public class PageView
     private int selected_crop_h;
 
     /* Cursor over this page */
-    private Gdk.CursorType cursor = Gdk.CursorType.ARROW;
+    public Gdk.CursorType cursor { get; private set; default = Gdk.CursorType.ARROW; }
 
     private int animate_n_segments = 7;
     private int animate_segment;
@@ -89,44 +101,6 @@ public class PageView
         page.scan_direction_changed.disconnect (scan_direction_changed_cb);
     }
 
-    public Page get_page ()
-    {
-        return page;
-    }
-
-    public void set_selected (bool selected)
-    {
-        if ((this.selected && selected) || (!this.selected && !selected))
-            return;
-        this.selected = selected;
-        changed ();
-    }
-
-    public bool get_selected ()
-    {
-        return selected;
-    }
-
-    public void set_x_offset (int offset)
-    {
-        x_offset = offset;
-    }
-
-    public void set_y_offset (int offset)
-    {
-        y_offset = offset;
-    }
-
-    public int get_x_offset ()
-    {
-        return x_offset;
-    }
-
-    public int get_y_offset ()
-    {
-        return y_offset;
-    }
-
     private uchar get_sample (uchar[] pixels, int offset, int x, int depth, int sample)
     {
         // FIXME
@@ -135,30 +109,30 @@ public class PageView
 
     private void get_pixel (Page page, int x, int y, uchar[] pixel)
     {
-        switch (page.get_scan_direction ())
+        switch (page.scan_direction)
         {
         case ScanDirection.TOP_TO_BOTTOM:
             break;
         case ScanDirection.BOTTOM_TO_TOP:
-            x = page.get_scan_width () - x - 1;
-            y = page.get_scan_height () - y - 1;
+            x = page.scan_width - x - 1;
+            y = page.scan_height - y - 1;
             break;
         case ScanDirection.LEFT_TO_RIGHT:
             var t = x;
-            x = page.get_scan_width () - y - 1;
+            x = page.scan_width - y - 1;
             y = t;
             break;
         case ScanDirection.RIGHT_TO_LEFT:
             var t = x;
             x = y;
-            y = page.get_scan_height () - t - 1;
+            y = page.scan_height - t - 1;
             break;
         }
 
-        var depth = page.get_depth ();
-        var n_channels = page.get_n_channels ();
+        var depth = page.depth;
+        var n_channels = page.n_channels;
         unowned uchar[] pixels = page.get_pixels ();
-        var offset = page.get_rowstride () * y;
+        var offset = page.rowstride * y;
 
         /* Optimise for 8 bit images */
         if (depth == 8 && n_channels == 3)
@@ -431,14 +405,14 @@ public class PageView
     private void update_preview (Page page, ref Gdk.Pixbuf? output_image, int output_width, int output_height,
                                  ScanDirection scan_direction, int old_scan_line, int scan_line)
     {
-        var input_width = page.get_width ();
-        var input_height = page.get_height ();
+        var input_width = page.width;
+        var input_height = page.height;
 
         /* Create new image if one does not exist or has changed size */
         int L, R, T, B;
         if (output_image == null ||
-            output_image.get_width () != output_width ||
-            output_image.get_height () != output_height)
+            output_image.width != output_width ||
+            output_image.height != output_height)
         {
             output_image = new Gdk.Pixbuf (Gdk.Colorspace.RGB,
                                            false,
@@ -500,10 +474,10 @@ public class PageView
         return_if_fail (output_image != null);
 
         unowned uchar[] output = output_image.get_pixels ();
-        var output_rowstride = output_image.get_rowstride ();
+        var output_rowstride = output_image.rowstride;
         var output_n_channels = output_image.get_n_channels ();
 
-        if (!page.has_data ())
+        if (!page.has_data)
         {
             for (var x = L; x <= R; x++)
                 for (var y = T; y <= B; y++)
@@ -548,19 +522,19 @@ public class PageView
             return;
 
         var old_scan_line = scan_line;
-        var scan_line = page.get_scan_line ();
+        var scan_line = page.scan_line;
 
         /* Delete old image if scan direction changed */
-        var left_steps = scan_direction - page.get_scan_direction ();
+        var left_steps = scan_direction - page.scan_direction;
         if (left_steps != 0 && image != null)
             image = null;
-        scan_direction = page.get_scan_direction ();
+        scan_direction = page.scan_direction;
 
         update_preview (page,
                         ref image,
                         get_preview_width (),
                         get_preview_height (),
-                        page.get_scan_direction (), old_scan_line, scan_line);
+                        page.scan_direction, old_scan_line, scan_line);
 
         update_image = false;
         this.scan_line = scan_line;
@@ -568,31 +542,33 @@ public class PageView
 
     private int page_to_screen_x (int x)
     {
-        return (int) ((double)x * get_preview_width () / page.get_width () + 0.5);
+        return (int) ((double)x * get_preview_width () / page.width + 0.5);
     }
 
     private int page_to_screen_y (int y)
     {
-        return (int) ((double)y * get_preview_height () / page.get_height () + 0.5);
+        return (int) ((double)y * get_preview_height () / page.height + 0.5);
     }
 
     private int screen_to_page_x (int x)
     {
-        return (int) ((double)x * page.get_width () / get_preview_width () + 0.5);
+        return (int) ((double)x * page.width / get_preview_width () + 0.5);
     }
 
     private int screen_to_page_y (int y)
     {
-        return (int) ((double)y * page.get_height () / get_preview_height () + 0.5);
+        return (int) ((double)y * page.height / get_preview_height () + 0.5);
     }
 
     private CropLocation get_crop_location (int x, int y)
     {
-        if (!page.has_crop ())
+        if (!page.has_crop)
             return 0;
 
-        int cx, cy, cw, ch;
-        page.get_crop (out cx, out cy, out cw, out ch);
+        var cx = page.crop_x;
+        var cy = page.crop_y;
+        var cw = page.crop_width;
+        var ch = page.crop_height;
         var dx = page_to_screen_x (cx);
         var dy = page_to_screen_y (cy);
         var dw = page_to_screen_x (cw);
@@ -604,7 +580,7 @@ public class PageView
             return CropLocation.NONE;
 
         /* Can't resize named crops */
-        var name = page.get_named_crop ();
+        var name = page.crop_name;
         if (name != null)
             return CropLocation.MIDDLE;
 
@@ -647,19 +623,17 @@ public class PageView
 
     public void button_press (int x, int y)
     {
-        CropLocation location;
-
         /* See if selecting crop */
-        location = get_crop_location (x, y);;
+        var location = get_crop_location (x, y);
         if (location != CropLocation.NONE)
         {
             crop_location = location;
             selected_crop_px = x;
             selected_crop_py = y;
-            page.get_crop (out selected_crop_x,
-                           out selected_crop_y,
-                           out selected_crop_w,
-                           out selected_crop_h);
+            selected_crop_x = page.crop_x;
+            selected_crop_y = page.crop_y;
+            selected_crop_w = page.crop_width;
+            selected_crop_h = page.crop_height;;
         }
     }
 
@@ -708,10 +682,10 @@ public class PageView
         }
 
         /* Move the crop */
-        var pw = page.get_width ();
-        var ph = page.get_height ();
-        int cx, cy, cw, ch;
-        page.get_crop (out cx, out cy, out cw, out ch);
+        var pw = page.width;
+        var ph = page.height;
+        var cw = page.crop_width;
+        var ch = page.crop_height;
 
         var dx = screen_to_page_x (x - (int) selected_crop_px);
         var dy = screen_to_page_y (y - (int) selected_crop_py);
@@ -816,11 +790,6 @@ public class PageView
         changed ();
     }
 
-    public Gdk.CursorType get_cursor ()
-    {
-        return cursor;
-    }
-
     private bool animation_cb ()
     {
         animate_segment = (animate_segment + 1) % animate_n_segments;
@@ -832,7 +801,7 @@ public class PageView
     {
         bool animate, is_animating;
 
-        animate = page.is_scanning () && !page.has_data ();
+        animate = page.is_scanning && !page.has_data;
         is_animating = animate_timeout != 0;
         if (animate == is_animating)
             return;
@@ -877,7 +846,7 @@ public class PageView
         context.paint ();
 
         /* Draw throbber */
-        if (page.is_scanning () && !page.has_data ())
+        if (page.is_scanning && !page.has_data)
         {
             double outer_radius;
             if (w > h)
@@ -910,13 +879,13 @@ public class PageView
         }
 
         /* Draw scan line */
-        if (page.is_scanning () && page.get_scan_line () > 0)
+        if (page.is_scanning && page.scan_line > 0)
         {
-            var scan_line = page.get_scan_line ();
+            var scan_line = page.scan_line;
 
             double s;
             double x1, y1, x2, y2;
-            switch (page.get_scan_direction ())
+            switch (page.scan_direction)
             {
             case ScanDirection.TOP_TO_BOTTOM:
                 s = page_to_screen_y (scan_line);
@@ -950,10 +919,12 @@ public class PageView
         }
 
         /* Draw crop */
-        if (page.has_crop ())
+        if (page.has_crop)
         {
-            int x, y, crop_width, crop_height;
-            page.get_crop (out x, out y, out crop_width, out crop_height);
+            var x = page.crop_x;
+            var y = page.crop_y;
+            var crop_width = page.crop_width;
+            var crop_height = page.crop_height;
 
             var dx = page_to_screen_x (x);
             var dy = page_to_screen_y (y);
@@ -981,7 +952,7 @@ public class PageView
     public void set_width (int width)
     {
         // FIXME: Automatically update when get updated image
-        var height = (int) ((double)width * page.get_height () / page.get_width ());
+        var height = (int) ((double)width * page.height / page.width);
         if (this.width == width && this.height == height)
             return;
 
@@ -998,7 +969,7 @@ public class PageView
     public void set_height (int height)
     {
         // FIXME: Automatically update when get updated image
-        var width = (int) ((double)height * page.get_width () / page.get_height ());
+        var width = (int) ((double)height * page.width / page.height);
         if (this.width == width && this.height == height)
             return;
 
diff --git a/src/page.c b/src/page.c
index eee78d1..d870104 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.20.1, the Vala compiler
+/* page.c generated by valac 0.22.1, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -97,27 +97,27 @@ struct _PageClass {
 };
 
 struct _PagePrivate {
-	gint dpi;
+	gint _dpi;
 	gint expected_rows;
-	gint depth;
-	gchar* color_profile;
-	gint width;
-	gint n_rows;
-	gint rowstride;
-	gint n_channels;
+	gint _depth;
+	gchar* _color_profile;
+	gint _scan_width;
+	gint _scan_height;
+	gint _rowstride;
+	gint _n_channels;
 	guchar* pixels;
 	gint pixels_length1;
 	gint _pixels_size_;
-	gboolean scanning;
-	gboolean has_data_;
-	gint scan_line;
-	ScanDirection scan_direction;
-	gboolean has_crop_;
-	gchar* crop_name;
-	gint crop_x;
-	gint crop_y;
-	gint crop_width;
-	gint crop_height;
+	gboolean _is_scanning;
+	gboolean _has_data;
+	gint _scan_line;
+	ScanDirection scan_direction_;
+	gboolean _has_crop;
+	gchar* _crop_name;
+	gint _crop_x;
+	gint _crop_y;
+	gint _crop_width;
+	gint _crop_height;
 };
 
 struct _ScanPageInfo {
@@ -194,6 +194,24 @@ enum  {
 };
 Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
 Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
+static void page_set_scan_width (Page* self, gint value);
+static void page_set_scan_height (Page* self, gint value);
+static void page_set_dpi (Page* self, gint value);
+void page_set_scan_direction (Page* self, ScanDirection value);
+Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
+Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height);
+static void page_set_rowstride (Page* self, gint value);
+static void page_set_n_channels (Page* self, gint value);
+static void page_set_depth (Page* self, gint value);
+void page_set_color_profile (Page* self, const gchar* value);
+static guchar* _vala_array_dup3 (guchar* self, int length);
+static void page_set_has_data (Page* self, gboolean value);
+static void page_set_has_crop (Page* self, gboolean value);
+static void page_set_crop_name (Page* self, const gchar* value);
+static void page_set_crop_x (Page* self, gint value);
+static void page_set_crop_y (Page* self, gint value);
+static void page_set_crop_width (Page* self, gint value);
+static void page_set_crop_height (Page* self, gint value);
 gpointer scan_page_info_ref (gpointer instance);
 void scan_page_info_unref (gpointer instance);
 GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -202,11 +220,13 @@ void value_take_scan_page_info (GValue* value, gpointer v_object);
 gpointer value_get_scan_page_info (const GValue* value);
 GType scan_page_info_get_type (void) G_GNUC_CONST;
 void page_set_page_info (Page* self, ScanPageInfo* info);
+gint page_get_scan_height (Page* self);
+gint page_get_scan_width (Page* self);
+gint page_get_depth (Page* self);
+gint page_get_n_channels (Page* self);
+gint page_get_rowstride (Page* self);
 void page_start (Page* self);
-gboolean page_is_scanning (Page* self);
-gboolean page_has_data (Page* self);
-gboolean page_is_color (Page* self);
-gint page_get_scan_line (Page* self);
+static void page_set_is_scanning (Page* self, gboolean value);
 gpointer scan_line_ref (gpointer instance);
 void scan_line_unref (gpointer instance);
 GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -215,42 +235,34 @@ void value_take_scan_line (GValue* value, gpointer v_object);
 gpointer value_get_scan_line (const GValue* value);
 GType scan_line_get_type (void) G_GNUC_CONST;
 static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_changed);
-gint page_get_scan_height (Page* self);
+static void page_set_scan_line (Page* self, gint value);
 void page_parse_scan_line (Page* self, ScanLine* line);
 void page_finish (Page* self);
-ScanDirection page_get_scan_direction (Page* self);
-static void page_set_scan_direction (Page* self, ScanDirection direction);
-gint page_get_width (Page* self);
-gint page_get_height (Page* self);
+gint page_get_scan_line (Page* self);
 void page_rotate_left (Page* self);
+ScanDirection page_get_scan_direction (Page* self);
 void page_rotate_right (Page* self);
-gint page_get_dpi (Page* self);
-gboolean page_is_landscape (Page* self);
-gint page_get_depth (Page* self);
-gint page_get_n_channels (Page* self);
-gint page_get_rowstride (Page* self);
-gint page_get_scan_width (Page* self);
-void page_set_color_profile (Page* self, const gchar* color_profile);
-gchar* page_get_color_profile (Page* self);
 void page_set_no_crop (Page* self);
+gboolean page_get_has_crop (Page* self);
 void page_set_custom_crop (Page* self, gint width, gint height);
+const gchar* page_get_crop_name (Page* self);
+gint page_get_crop_width (Page* self);
+gint page_get_crop_height (Page* self);
 void page_set_named_crop (Page* self, const gchar* name);
+gint page_get_width (Page* self);
+gint page_get_height (Page* self);
+gint page_get_dpi (Page* self);
 void page_move_crop (Page* self, gint x, gint y);
 void page_rotate_crop (Page* self);
-gboolean page_has_crop (Page* self);
-void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height);
-gchar* page_get_named_crop (Page* self);
+gint page_get_crop_x (Page* self);
+gint page_get_crop_y (Page* self);
 guchar* page_get_pixels (Page* self, int* result_length1);
-void page_set_pixels (Page* self, guchar* new_pixels, int new_pixels_length1);
-static guchar* _vala_array_dup3 (guchar* self, int length);
 static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint n_channels, gint channel);
 static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel_length1, gint offset);
 GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
 static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_filename);
 void page_copy_to_clipboard (Page* self, GtkWindow* window);
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
-PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream);
-PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream);
 gpointer pixbuf_writer_ref (gpointer instance);
 void pixbuf_writer_unref (gpointer instance);
 GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -258,7 +270,14 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object);
 void value_take_pixbuf_writer (GValue* value, gpointer v_object);
 gpointer value_get_pixbuf_writer (const GValue* value);
 GType pixbuf_writer_get_type (void) G_GNUC_CONST;
+PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream);
+PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream);
+const gchar* page_get_color_profile (Page* self);
 void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type, gchar** option_keys, int option_keys_length1, gchar** option_values, int option_values_length1, GError** error);
+gboolean page_get_is_landscape (Page* self);
+gboolean page_get_is_scanning (Page* self);
+gboolean page_get_has_data (Page* self);
+gboolean page_get_is_color (Page* self);
 static void page_finalize (Page* obj);
 enum  {
 	PIXBUF_WRITER_DUMMY_PROPERTY
@@ -285,2674 +304,2125 @@ GType scan_direction_get_type (void) {
 Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction) {
 	Page* self = NULL;
 	gboolean _tmp0_ = FALSE;
-	ScanDirection _tmp1_;
-	gboolean _tmp3_;
-	gint _tmp8_;
-	ScanDirection _tmp9_;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	ScanDirection _tmp1_ = 0;
+	gboolean _tmp3_ = FALSE;
+	gint _tmp8_ = 0;
+	ScanDirection _tmp9_ = 0;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (Page*) g_type_create_instance (object_type);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = scan_direction;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
-#line 301 "page.c"
+#line 320 "page.c"
 	} else {
-		ScanDirection _tmp2_;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		ScanDirection _tmp2_ = 0;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = scan_direction;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 308 "page.c"
+#line 327 "page.c"
 	}
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp0_;
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
-#line 314 "page.c"
-		gint _tmp4_;
-		gint _tmp5_;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 333 "page.c"
+		gint _tmp4_ = 0;
+		gint _tmp5_ = 0;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = width;
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->width = _tmp4_;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_width (self, _tmp4_);
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = height;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->n_rows = _tmp5_;
-#line 325 "page.c"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_height (self, _tmp5_);
+#line 344 "page.c"
 	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = height;
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->width = _tmp6_;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_width (self, _tmp6_);
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = width;
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->n_rows = _tmp7_;
-#line 337 "page.c"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_height (self, _tmp7_);
+#line 356 "page.c"
 	}
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = dpi;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->dpi = _tmp8_;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_dpi (self, _tmp8_);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = scan_direction;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scan_direction = _tmp9_;
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_direction (self, _tmp9_);
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 349 "page.c"
+#line 368 "page.c"
 }
 
 
 Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction) {
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return page_construct (TYPE_PAGE, width, height, dpi, scan_direction);
-#line 356 "page.c"
+#line 375 "page.c"
+}
+
+
+static guchar* _vala_array_dup3 (guchar* self, int length) {
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return g_memdup (self, length * sizeof (guchar));
+#line 382 "page.c"
+}
+
+
+Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) {
+	Page* self = NULL;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	ScanDirection _tmp7_ = 0;
+	const gchar* _tmp8_ = NULL;
+	guchar* _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	guchar* _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+	guchar* _tmp11_ = NULL;
+	gint _tmp11__length1 = 0;
+	gboolean _tmp12_ = FALSE;
+	const gchar* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	gint _tmp17_ = 0;
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self = (Page*) g_type_create_instance (object_type);
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = scan_width;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_width (self, _tmp0_);
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = scan_height;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_height (self, _tmp1_);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = scan_height;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->expected_rows = _tmp2_;
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp3_ = rowstride;
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_rowstride (self, _tmp3_);
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp4_ = n_channels;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_n_channels (self, _tmp4_);
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = depth;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_depth (self, _tmp5_);
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp6_ = dpi;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_dpi (self, _tmp6_);
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp7_ = scan_direction;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_direction (self, _tmp7_);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp8_ = color_profile;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_color_profile (self, _tmp8_);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp9_ = pixels;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp9__length1 = pixels_length1;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup3 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp10__length1 = _tmp9__length1;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->pixels = (g_free (self->priv->pixels), NULL);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->pixels = _tmp10_;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->pixels_length1 = _tmp10__length1;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_pixels_size_ = self->priv->pixels_length1;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp11_ = pixels;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp11__length1 = pixels_length1;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_has_data (self, _tmp11_ != NULL);
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp12_ = has_crop;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_has_crop (self, _tmp12_);
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp13_ = crop_name;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_name (self, _tmp13_);
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp14_ = crop_x;
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_x (self, _tmp14_);
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp15_ = crop_y;
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_y (self, _tmp15_);
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp16_ = crop_width;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_width (self, _tmp16_);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp17_ = crop_height;
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_height (self, _tmp17_);
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return self;
+#line 495 "page.c"
+}
+
+
+Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) {
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return page_construct_from_data (TYPE_PAGE, scan_width, scan_height, rowstride, n_channels, depth, dpi, scan_direction, color_profile, pixels, pixels_length1, has_crop, crop_name, crop_x, crop_y, crop_width, crop_height);
+#line 502 "page.c"
 }
 
 
 void page_set_page_info (Page* self, ScanPageInfo* info) {
-	ScanPageInfo* _tmp0_;
-	gint _tmp1_;
-	ScanPageInfo* _tmp2_;
-	gdouble _tmp3_;
-	ScanPageInfo* _tmp4_;
-	gint _tmp5_;
-	ScanPageInfo* _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
-	ScanPageInfo* _tmp10_;
-	gint _tmp11_;
-	ScanPageInfo* _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_;
+	ScanPageInfo* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	ScanPageInfo* _tmp2_ = NULL;
+	gdouble _tmp3_ = 0.0;
+	ScanPageInfo* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	ScanPageInfo* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
+	gint _tmp8_ = 0;
+	ScanPageInfo* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
+	ScanPageInfo* _tmp12_ = NULL;
+	gint _tmp13_ = 0;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	gint _tmp17_ = 0;
+	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-	guchar* _tmp20_;
-	gint _tmp20__length1;
-	gint _tmp21_;
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	guchar* _tmp20_ = NULL;
+	gint _tmp20__length1 = 0;
+	gint _tmp21_ = 0;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (info != NULL);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = info;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_->height;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->expected_rows = _tmp1_;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = info;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp2_->dpi;
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->dpi = (gint) _tmp3_;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_dpi (self, (gint) _tmp3_);
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = info;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->width = _tmp5_;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_width (self, _tmp5_);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = info;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->n_rows = _tmp7_;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = self->priv->n_rows;
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_height (self, _tmp7_);
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp8_ = self->priv->_scan_height;
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp8_ < 0) {
-#line 415 "page.c"
-		gint _tmp9_;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->width;
-#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->n_rows = _tmp9_ / 2;
-#line 421 "page.c"
+#line 561 "page.c"
+		gint _tmp9_ = 0;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp9_ = self->priv->_scan_width;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_height (self, _tmp9_ / 2);
+#line 567 "page.c"
 	}
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = info;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = _tmp10_->depth;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->depth = _tmp11_;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_depth (self, _tmp11_);
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = info;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = _tmp12_->n_channels;
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->n_channels = _tmp13_;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = self->priv->width;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = self->priv->depth;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = self->priv->n_channels;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->rowstride = (((_tmp14_ * _tmp15_) * _tmp16_) + 7) / 8;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = self->priv->n_rows;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp18_ = self->priv->rowstride;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_n_channels (self, _tmp13_);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp14_ = self->priv->_scan_width;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp15_ = self->priv->_depth;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp16_ = self->priv->_n_channels;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_rowstride (self, (((_tmp14_ * _tmp15_) * _tmp16_) + 7) / 8);
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp17_ = self->priv->_scan_height;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp18_ = self->priv->_rowstride;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp19_ = _tmp17_ * _tmp18_;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp17_ * _tmp18_);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	(_tmp19_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp19_ - self->priv->pixels_length1)) : NULL;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels_length1 = _tmp19_;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_pixels_size_ = _tmp19_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20_ = self->priv->pixels;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20__length1 = self->priv->pixels_length1;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp20_ != NULL);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp21_ = self->priv->depth;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp21_ = self->priv->_depth;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp21_ == 1) {
-#line 467 "page.c"
-		guchar* _tmp22_;
-		gint _tmp22__length1;
-		gint _tmp23_;
-		gint _tmp24_;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 613 "page.c"
+		guchar* _tmp22_ = NULL;
+		gint _tmp22__length1 = 0;
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = self->priv->pixels;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22__length1 = self->priv->pixels_length1;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = self->priv->n_rows;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = self->priv->rowstride;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp23_ = self->priv->_scan_height;
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp24_ = self->priv->_rowstride;
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp22_, 0x00, (gsize) (_tmp23_ * _tmp24_));
-#line 482 "page.c"
+#line 628 "page.c"
 	} else {
-		guchar* _tmp25_;
-		gint _tmp25__length1;
-		gint _tmp26_;
-		gint _tmp27_;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		guchar* _tmp25_ = NULL;
+		gint _tmp25__length1 = 0;
+		gint _tmp26_ = 0;
+		gint _tmp27_ = 0;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = self->priv->pixels;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25__length1 = self->priv->pixels_length1;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26_ = self->priv->n_rows;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp27_ = self->priv->rowstride;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_ = self->priv->_scan_height;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp27_ = self->priv->_rowstride;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp25_, 0xFF, (gsize) (_tmp26_ * _tmp27_));
-#line 498 "page.c"
+#line 644 "page.c"
 	}
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
-#line 504 "page.c"
+#line 650 "page.c"
 }
 
 
 void page_start (Page* self) {
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scanning = TRUE;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_is_scanning (self, TRUE);
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
-#line 515 "page.c"
-}
-
-
-gboolean page_is_scanning (Page* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scanning;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 530 "page.c"
-}
-
-
-gboolean page_has_data (Page* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->has_data_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 545 "page.c"
-}
-
-
-gboolean page_is_color (Page* self) {
-	gboolean result = FALSE;
-	gint _tmp0_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->n_channels;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_ > 1;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 560 "page.c"
-}
-
-
-gint page_get_scan_line (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_line;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 575 "page.c"
+#line 661 "page.c"
 }
 
 
 static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_changed) {
 	gboolean _vala_size_changed = FALSE;
 	gint line_number = 0;
-	ScanLine* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint offset;
-	gint _tmp15_;
-	ScanLine* _tmp16_;
-	gint _tmp17_;
-	gint line_offset;
-	gint _tmp33_;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	ScanLine* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint offset = 0;
+	gint _tmp13_ = 0;
+	gint _tmp14_ = 0;
+	gint line_offset = 0;
+	gint _tmp15_ = 0;
+	ScanLine* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	gint _tmp33_ = 0;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = line;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_->number;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = n;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_number = _tmp1_ + _tmp2_;
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_size_changed = FALSE;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	while (TRUE) {
-#line 609 "page.c"
-		gint _tmp3_;
+#line 695 "page.c"
+		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		gint rows = 0;
-		gint _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-		gint _tmp11_;
+		gint _tmp5_ = 0;
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = line_number;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = page_get_scan_height (self);
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp4_ = self->priv->_scan_height;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (!(_tmp3_ >= _tmp4_)) {
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 629 "page.c"
+#line 715 "page.c"
 		}
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->n_rows;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp5_ = self->priv->_scan_height;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		rows = _tmp5_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = rows;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->width;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->n_rows = _tmp6_ + (_tmp7_ / 2);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp7_ = self->priv->_scan_width;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_height (self, _tmp6_ + (_tmp7_ / 2));
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = rows;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->n_rows;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_debug ("page.vala:152: Extending image from %d lines to %d lines", _tmp8_, _tmp9_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = self->priv->n_rows;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = self->priv->rowstride;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp9_ = self->priv->_scan_height;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_debug ("page.vala:269: Extending image from %d lines to %d lines", _tmp8_, _tmp9_);
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp10_ = self->priv->_scan_height;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp11_ = self->priv->_rowstride;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = _tmp10_ * _tmp11_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp10_ * _tmp11_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		(_tmp12_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp12_ - self->priv->pixels_length1)) : NULL;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels_length1 = _tmp12_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->_pixels_size_ = _tmp12_;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_vala_size_changed = TRUE;
-#line 663 "page.c"
+#line 749 "page.c"
 	}
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = line_number;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = self->priv->rowstride;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp14_ = self->priv->_rowstride;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	offset = _tmp13_ * _tmp14_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = n;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = line;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = _tmp16_->data_length;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_offset = _tmp15_ * _tmp17_;
-#line 679 "page.c"
+#line 765 "page.c"
 	{
-		gint i;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint i = 0;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
-#line 684 "page.c"
+#line 770 "page.c"
 		{
-			gboolean _tmp18_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gboolean _tmp18_ = FALSE;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp18_ = TRUE;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
-#line 691 "page.c"
-				gboolean _tmp19_;
-				gint _tmp21_;
-				ScanLine* _tmp22_;
-				gint _tmp23_;
-				guchar* _tmp24_;
-				gint _tmp24__length1;
-				gint _tmp25_;
-				gint _tmp26_;
-				ScanLine* _tmp27_;
-				guchar* _tmp28_;
-				gint _tmp28__length1;
-				gint _tmp29_;
-				gint _tmp30_;
-				guchar _tmp31_;
-				guchar _tmp32_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 777 "page.c"
+				gboolean _tmp19_ = FALSE;
+				gint _tmp21_ = 0;
+				ScanLine* _tmp22_ = NULL;
+				gint _tmp23_ = 0;
+				guchar* _tmp24_ = NULL;
+				gint _tmp24__length1 = 0;
+				gint _tmp25_ = 0;
+				gint _tmp26_ = 0;
+				ScanLine* _tmp27_ = NULL;
+				guchar* _tmp28_ = NULL;
+				gint _tmp28__length1 = 0;
+				gint _tmp29_ = 0;
+				gint _tmp30_ = 0;
+				guchar _tmp31_ = '\0';
+				guchar _tmp32_ = '\0';
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp19_ = _tmp18_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp19_) {
-#line 711 "page.c"
-					gint _tmp20_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 797 "page.c"
+					gint _tmp20_ = 0;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp20_ = i;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					i = _tmp20_ + 1;
-#line 717 "page.c"
+#line 803 "page.c"
 				}
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp18_ = FALSE;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp21_ = i;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp22_ = line;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23_ = _tmp22_->data_length;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp21_ < _tmp23_)) {
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
-#line 731 "page.c"
+#line 817 "page.c"
 				}
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_ = self->priv->pixels;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24__length1 = self->priv->pixels_length1;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp25_ = offset;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp26_ = i;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp27_ = line;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28_ = _tmp27_->data;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28__length1 = _tmp27_->data_length1;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp29_ = line_offset;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp30_ = i;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp31_ = _tmp28_[_tmp29_ + _tmp30_];
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_[_tmp25_ + _tmp26_] = _tmp31_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp32_ = _tmp24_[_tmp25_ + _tmp26_];
-#line 757 "page.c"
+#line 843 "page.c"
 			}
 		}
 	}
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp33_ = line_number;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scan_line = _tmp33_;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_scan_line (self, _tmp33_);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (size_changed) {
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*size_changed = _vala_size_changed;
-#line 769 "page.c"
+#line 855 "page.c"
 	}
 }
 
 
 void page_parse_scan_line (Page* self, ScanLine* line) {
-	gboolean size_has_changed;
-	gboolean _tmp9_;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gboolean size_has_changed = FALSE;
+	gboolean _tmp9_ = FALSE;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
-#line 783 "page.c"
+#line 869 "page.c"
 	{
-		gint i;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint i = 0;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
-#line 788 "page.c"
+#line 874 "page.c"
 		{
-			gboolean _tmp0_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gboolean _tmp0_ = FALSE;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp0_ = TRUE;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
-#line 795 "page.c"
-				gboolean _tmp1_;
-				gint _tmp3_;
-				ScanLine* _tmp4_;
-				gint _tmp5_;
-				ScanLine* _tmp6_;
-				gint _tmp7_;
+#line 881 "page.c"
+				gboolean _tmp1_ = FALSE;
+				gint _tmp3_ = 0;
+				ScanLine* _tmp4_ = NULL;
+				gint _tmp5_ = 0;
+				ScanLine* _tmp6_ = NULL;
+				gint _tmp7_ = 0;
 				gboolean _tmp8_ = FALSE;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp1_ = _tmp0_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp1_) {
-#line 807 "page.c"
-					gint _tmp2_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 893 "page.c"
+					gint _tmp2_ = 0;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp2_ = i;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					i = _tmp2_ + 1;
-#line 813 "page.c"
+#line 899 "page.c"
 				}
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp0_ = FALSE;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp3_ = i;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp4_ = line;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp5_ = _tmp4_->n_lines;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp3_ < _tmp5_)) {
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
-#line 827 "page.c"
+#line 913 "page.c"
 				}
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp6_ = line;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp7_ = i;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_parse_line (self, _tmp6_, _tmp7_, &_tmp8_);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				size_has_changed = _tmp8_;
-#line 837 "page.c"
+#line 923 "page.c"
 			}
 		}
 	}
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->has_data_ = TRUE;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_has_data (self, TRUE);
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = size_has_changed;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp9_) {
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
-#line 849 "page.c"
+#line 935 "page.c"
 	}
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
-#line 855 "page.c"
+#line 941 "page.c"
 }
 
 
 void page_finish (Page* self) {
-	gboolean size_has_changed;
+	gboolean size_has_changed = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	gboolean _tmp4_;
-	gboolean _tmp12_;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gint _tmp1_ = 0;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp12_ = FALSE;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->expected_rows;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ < 0) {
-#line 873 "page.c"
-		gint _tmp2_;
+#line 959 "page.c"
+		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = self->priv->scan_line;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = page_get_scan_height (self);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp2_ = self->priv->_scan_line;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp3_ = self->priv->_scan_height;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
-#line 882 "page.c"
+#line 968 "page.c"
 	} else {
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
-#line 886 "page.c"
+#line 972 "page.c"
 	}
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = _tmp0_;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_) {
-#line 892 "page.c"
+#line 978 "page.c"
 		gint rows = 0;
-		gint _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		gint _tmp8_;
+		gint _tmp5_ = 0;
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
-		gint _tmp10_;
-		gint _tmp11_;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->n_rows;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp5_ = self->priv->_scan_height;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		rows = _tmp5_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->scan_line;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->n_rows = _tmp6_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->n_rows;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = self->priv->rowstride;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = self->priv->_scan_line;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_scan_height (self, _tmp6_);
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp7_ = self->priv->_scan_height;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp8_ = self->priv->_rowstride;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = _tmp7_ * _tmp8_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp7_ * _tmp8_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		(_tmp9_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp9_ - self->priv->pixels_length1)) : NULL;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels_length1 = _tmp9_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->_pixels_size_ = _tmp9_;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = rows;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = self->priv->n_rows;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_debug ("page.vala:194: Trimming page from %d lines to %d lines", _tmp10_, _tmp11_);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp11_ = self->priv->_scan_height;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp10_, _tmp11_);
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
-#line 931 "page.c"
+#line 1017 "page.c"
 	}
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scanning = FALSE;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_is_scanning (self, FALSE);
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = size_has_changed;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp12_) {
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
-#line 941 "page.c"
+#line 1027 "page.c"
 	}
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-finished");
-#line 947 "page.c"
-}
-
-
-ScanDirection page_get_scan_direction (Page* self) {
-	ScanDirection result = 0;
-	ScanDirection _tmp0_;
-#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_direction;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 962 "page.c"
-}
-
-
-static void page_set_scan_direction (Page* self, ScanDirection direction) {
-	gint left_steps = 0;
-	gint t = 0;
-	gboolean size_has_changed;
-	gint width = 0;
-	gint height = 0;
-	ScanDirection _tmp0_;
-	ScanDirection _tmp1_;
-	ScanDirection _tmp2_;
-	ScanDirection _tmp3_;
-	gint _tmp4_;
-	gint _tmp6_;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gboolean _tmp9_;
-	ScanDirection _tmp33_;
-	gboolean _tmp34_;
-	gboolean _tmp35_;
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	size_has_changed = FALSE;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_direction;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = direction;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return;
-#line 996 "page.c"
-	}
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = direction;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = self->priv->scan_direction;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	left_steps = (gint) (_tmp2_ - _tmp3_);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = left_steps;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp4_ < 0) {
-#line 1008 "page.c"
-		gint _tmp5_;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = left_steps;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		left_steps = _tmp5_ + 4;
-#line 1014 "page.c"
-	}
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = left_steps;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp6_ != 2) {
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		size_has_changed = TRUE;
-#line 1022 "page.c"
-	}
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = page_get_width (self);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	width = _tmp7_;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = page_get_height (self);
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	height = _tmp8_;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = self->priv->has_crop_;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp9_) {
-#line 1036 "page.c"
-		gint _tmp10_;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = left_steps;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		switch (_tmp10_) {
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			case 1:
-#line 1044 "page.c"
-			{
-				gint _tmp11_;
-				gint _tmp12_;
-				gint _tmp13_;
-				gint _tmp14_;
-				gint _tmp15_;
-				gint _tmp16_;
-				gint _tmp17_;
-				gint _tmp18_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp11_ = self->priv->crop_x;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp11_;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp12_ = self->priv->crop_y;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_x = _tmp12_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp13_ = width;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp14_ = t;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp15_ = self->priv->crop_width;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_y = _tmp13_ - (_tmp14_ + _tmp15_);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp16_ = self->priv->crop_width;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp16_;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp17_ = self->priv->crop_height;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_width = _tmp17_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp18_ = t;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_height = _tmp18_;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1084 "page.c"
-			}
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			case 2:
-#line 1088 "page.c"
-			{
-				gint _tmp19_;
-				gint _tmp20_;
-				gint _tmp21_;
-				gint _tmp22_;
-				gint _tmp23_;
-				gint _tmp24_;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp19_ = width;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp20_ = self->priv->crop_x;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp21_ = self->priv->crop_width;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_x = _tmp19_ - (_tmp20_ + _tmp21_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp22_ = width;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp23_ = self->priv->crop_y;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp24_ = self->priv->crop_height;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_y = _tmp22_ - (_tmp23_ + _tmp24_);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1114 "page.c"
-			}
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			case 3:
-#line 1118 "page.c"
-			{
-				gint _tmp25_;
-				gint _tmp26_;
-				gint _tmp27_;
-				gint _tmp28_;
-				gint _tmp29_;
-				gint _tmp30_;
-				gint _tmp31_;
-				gint _tmp32_;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp25_ = self->priv->crop_y;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp25_;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp26_ = self->priv->crop_x;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_y = _tmp26_;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp27_ = height;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp28_ = t;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp29_ = self->priv->crop_height;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_x = _tmp27_ - (_tmp28_ + _tmp29_);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp30_ = self->priv->crop_width;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				t = _tmp30_;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp31_ = self->priv->crop_height;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_width = _tmp31_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp32_ = t;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				self->priv->crop_height = _tmp32_;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				break;
-#line 1158 "page.c"
-			}
-			default:
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			break;
-#line 1163 "page.c"
-		}
-	}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp33_ = direction;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scan_direction = _tmp33_;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp34_ = size_has_changed;
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp34_) {
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_signal_emit_by_name (self, "size-changed");
-#line 1176 "page.c"
-	}
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "scan-direction-changed");
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp35_ = self->priv->has_crop_;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp35_) {
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_signal_emit_by_name (self, "crop-changed");
-#line 1186 "page.c"
-	}
+#line 1033 "page.c"
 }
 
 
 void page_rotate_left (Page* self) {
-	ScanDirection _tmp0_;
-	ScanDirection direction;
-	ScanDirection _tmp1_;
-	ScanDirection _tmp2_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	ScanDirection _tmp0_ = 0;
+	ScanDirection _tmp1_ = 0;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_direction;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	direction = _tmp0_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = direction;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = page_get_scan_direction (self);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = _tmp0_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1208 "page.c"
+#line 1050 "page.c"
 		{
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1214 "page.c"
+#line 1056 "page.c"
 		}
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1218 "page.c"
+#line 1060 "page.c"
 		{
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1224 "page.c"
+#line 1066 "page.c"
 		}
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1228 "page.c"
+#line 1070 "page.c"
 		{
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1234 "page.c"
+#line 1076 "page.c"
 		}
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1238 "page.c"
+#line 1080 "page.c"
 		{
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1244 "page.c"
+#line 1086 "page.c"
 		}
 		default:
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
-#line 1249 "page.c"
+#line 1091 "page.c"
 	}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = direction;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_direction (self, _tmp2_);
-#line 1255 "page.c"
 }
 
 
 void page_rotate_right (Page* self) {
-	ScanDirection _tmp0_;
-	ScanDirection direction;
-	ScanDirection _tmp1_;
-	ScanDirection _tmp2_;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	ScanDirection _tmp0_ = 0;
+	ScanDirection _tmp1_ = 0;
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->scan_direction;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	direction = _tmp0_;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = direction;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = page_get_scan_direction (self);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = _tmp0_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1276 "page.c"
+#line 1109 "page.c"
 		{
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1282 "page.c"
+#line 1115 "page.c"
 		}
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1286 "page.c"
+#line 1119 "page.c"
 		{
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1292 "page.c"
+#line 1125 "page.c"
 		}
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1296 "page.c"
+#line 1129 "page.c"
 		{
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1302 "page.c"
+#line 1135 "page.c"
 		}
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1306 "page.c"
+#line 1139 "page.c"
 		{
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1312 "page.c"
+#line 1145 "page.c"
 		}
 		default:
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
-#line 1317 "page.c"
-	}
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = direction;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_direction (self, _tmp2_);
-#line 1323 "page.c"
-}
-
-
-gint page_get_dpi (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->dpi;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1338 "page.c"
-}
-
-
-gboolean page_is_landscape (Page* self) {
-	gboolean result = FALSE;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = page_get_width (self);
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = page_get_height (self);
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_ > _tmp1_;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1356 "page.c"
-}
-
-
-gint page_get_width (Page* self) {
-	gint result = 0;
-	gboolean _tmp0_ = FALSE;
-	ScanDirection _tmp1_;
-	gboolean _tmp3_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = self->priv->scan_direction;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = TRUE;
-#line 1373 "page.c"
-	} else {
-		ScanDirection _tmp2_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = self->priv->scan_direction;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 1380 "page.c"
-	}
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = _tmp0_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp3_) {
-#line 1386 "page.c"
-		gint _tmp4_;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = self->priv->width;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp4_;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 1394 "page.c"
-	} else {
-		gint _tmp5_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->n_rows;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp5_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 1403 "page.c"
+#line 1150 "page.c"
 	}
 }
 
 
-gint page_get_height (Page* self) {
-	gint result = 0;
+void page_set_no_crop (Page* self) {
 	gboolean _tmp0_ = FALSE;
-	ScanDirection _tmp1_;
-	gboolean _tmp3_;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = self->priv->scan_direction;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = TRUE;
-#line 1421 "page.c"
-	} else {
-		ScanDirection _tmp2_;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = self->priv->scan_direction;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 1428 "page.c"
-	}
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = _tmp0_;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp3_) {
-#line 1434 "page.c"
-		gint _tmp4_;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = self->priv->n_rows;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp4_;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 1442 "page.c"
-	} else {
-		gint _tmp5_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->width;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp5_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return result;
-#line 1451 "page.c"
-	}
-}
-
-
-gint page_get_depth (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->depth;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1467 "page.c"
-}
-
-
-gint page_get_n_channels (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->n_channels;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1482 "page.c"
-}
-
-
-gint page_get_rowstride (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->rowstride;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1497 "page.c"
-}
-
-
-gint page_get_scan_width (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->width;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1512 "page.c"
-}
-
-
-gint page_get_scan_height (Page* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, 0);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->n_rows;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1527 "page.c"
-}
-
-
-void page_set_color_profile (Page* self, const gchar* color_profile) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = color_profile;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->color_profile);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->color_profile = _tmp1_;
-#line 1544 "page.c"
-}
-
-
-gchar* page_get_color_profile (Page* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->color_profile;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp1_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 1562 "page.c"
-}
-
-
-void page_set_no_crop (Page* self) {
-	gboolean _tmp0_;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->has_crop_;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_has_crop;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!_tmp0_) {
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 1576 "page.c"
+#line 1165 "page.c"
 	}
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->has_crop_ = FALSE;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_has_crop (self, FALSE);
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_name (self, NULL);
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_x (self, 0);
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_y (self, 0);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_width (self, 0);
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_height (self, 0);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1582 "page.c"
+#line 1181 "page.c"
 }
 
 
 void page_set_custom_crop (Page* self, gint width, gint height) {
-	gint _tmp0_;
-	gint _tmp1_;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_;
-	gboolean _tmp7_;
-	gboolean _tmp10_;
-	gboolean _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	const gchar* _tmp5_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	gboolean _tmp10_ = FALSE;
+	gboolean _tmp13_ = FALSE;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = width;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp0_ >= 1);
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = height;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp1_ >= 1);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = self->priv->crop_name;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = self->priv->_crop_name;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ == NULL) {
-#line 1612 "page.c"
-		gboolean _tmp6_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->has_crop_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 1211 "page.c"
+		gboolean _tmp6_ = FALSE;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = self->priv->_has_crop;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = _tmp6_;
-#line 1618 "page.c"
+#line 1217 "page.c"
 	} else {
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = FALSE;
-#line 1622 "page.c"
+#line 1221 "page.c"
 	}
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp4_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp7_) {
-#line 1628 "page.c"
-		gint _tmp8_;
-		gint _tmp9_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = self->priv->crop_width;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 1227 "page.c"
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp8_ = self->priv->_crop_width;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = width;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = _tmp8_ == _tmp9_;
-#line 1637 "page.c"
+#line 1236 "page.c"
 	} else {
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = FALSE;
-#line 1641 "page.c"
+#line 1240 "page.c"
 	}
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = _tmp3_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_) {
-#line 1647 "page.c"
-		gint _tmp11_;
-		gint _tmp12_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = self->priv->crop_height;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 1246 "page.c"
+		gint _tmp11_ = 0;
+		gint _tmp12_ = 0;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp11_ = self->priv->_crop_height;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = height;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = _tmp11_ == _tmp12_;
-#line 1656 "page.c"
+#line 1255 "page.c"
 	} else {
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = FALSE;
-#line 1660 "page.c"
+#line 1259 "page.c"
 	}
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = _tmp2_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp13_) {
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 1668 "page.c"
+#line 1267 "page.c"
 	}
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->crop_name);
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_name = NULL;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->has_crop_ = TRUE;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_name (self, NULL);
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_has_crop (self, TRUE);
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = width;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_width = _tmp14_;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_width (self, _tmp14_);
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = height;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_height = _tmp15_;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_height (self, _tmp15_);
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1686 "page.c"
+#line 1283 "page.c"
 }
 
 
 void page_set_named_crop (Page* self, const gchar* name) {
-	gdouble width = 0.0;
-	gdouble height = 0.0;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
+	gdouble w = 0.0;
+	gdouble h = 0.0;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label4 = 0;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label5 = 0;
-#line 1708 "page.c"
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
+#line 1305 "page.c"
+	const gchar* _tmp5_ = NULL;
+	gint pw = 0;
+	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-	gint pw;
+	gint ph = 0;
 	gint _tmp8_ = 0;
-	gint ph;
-	gint _tmp9_;
-	gint _tmp10_;
-	gdouble _tmp14_;
-	gint _tmp15_;
-	gdouble _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-	gint _tmp22_;
-	gint _tmp23_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gint _tmp9_ = 0;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	gdouble _tmp15_ = 0.0;
+	gint _tmp16_ = 0;
+	gdouble _tmp17_ = 0.0;
+	gint _tmp18_ = 0;
+	gint _tmp19_ = 0;
+	gint _tmp20_ = 0;
+	gint _tmp23_ = 0;
+	gint _tmp24_ = 0;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (name != NULL);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = name;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("A4")))) {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1739 "page.c"
+#line 1337 "page.c"
 			default:
 			{
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				width = 8.3;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				height = 11.7;
-#line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				w = 8.3;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				h = 11.7;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1748 "page.c"
+#line 1346 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("A5")))) {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1754 "page.c"
+#line 1352 "page.c"
 			default:
 			{
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				width = 5.8;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				height = 8.3;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				w = 5.8;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				h = 8.3;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1763 "page.c"
+#line 1361 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("A6")))) {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1769 "page.c"
+#line 1367 "page.c"
 			default:
 			{
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				width = 4.1;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				height = 5.8;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				w = 4.1;
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				h = 5.8;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1778 "page.c"
+#line 1376 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("letter")))) {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1784 "page.c"
+#line 1382 "page.c"
 			default:
 			{
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				width = 8.5;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				height = (gdouble) 11;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				w = 8.5;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				h = (gdouble) 11;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1793 "page.c"
+#line 1391 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("legal")))) {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1799 "page.c"
+#line 1397 "page.c"
 			default:
 			{
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				width = 8.5;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				height = (gdouble) 14;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				w = 8.5;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				h = (gdouble) 14;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1808 "page.c"
+#line 1406 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("4x6")))) {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1814 "page.c"
+#line 1412 "page.c"
 			default:
 			{
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				width = (gdouble) 4;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				height = (gdouble) 6;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				w = (gdouble) 4;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				h = (gdouble) 6;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1823 "page.c"
+#line 1421 "page.c"
 			}
 		}
 	} else {
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1829 "page.c"
+#line 1427 "page.c"
 			default:
 			{
-				const gchar* _tmp4_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				const gchar* _tmp4_ = NULL;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp4_ = name;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				g_warning ("page.vala:439: Unknown paper size '%s'", _tmp4_);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				g_warning ("page.vala:429: Unknown paper size '%s'", _tmp4_);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
-#line 1839 "page.c"
+#line 1437 "page.c"
 			}
 		}
 	}
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = name;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->crop_name);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_name = _tmp6_;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->has_crop_ = TRUE;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = page_get_width (self);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_name (self, _tmp5_);
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_has_crop (self, TRUE);
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp6_ = page_get_width (self);
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp7_ = _tmp6_;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pw = _tmp7_;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = page_get_height (self);
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	ph = _tmp8_;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = pw;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10_ = ph;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp9_ > _tmp10_) {
-#line 1867 "page.c"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp9_ = _tmp8_;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	ph = _tmp9_;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp10_ = pw;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp11_ = ph;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp10_ > _tmp11_) {
+#line 1465 "page.c"
 		gdouble t = 0.0;
-		gdouble _tmp11_;
-		gdouble _tmp12_;
-		gdouble _tmp13_;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = width;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		t = _tmp11_;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = height;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		width = _tmp12_;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp13_ = t;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		height = _tmp13_;
-#line 1884 "page.c"
+		gdouble _tmp12_ = 0.0;
+		gdouble _tmp13_ = 0.0;
+		gdouble _tmp14_ = 0.0;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp12_ = w;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		t = _tmp12_;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp13_ = h;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		w = _tmp13_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp14_ = t;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		h = _tmp14_;
+#line 1482 "page.c"
 	}
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = width;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = self->priv->dpi;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_width = (gint) ((_tmp14_ * _tmp15_) + 0.5);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = height;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp17_ = self->priv->dpi;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_height = (gint) ((_tmp16_ * _tmp17_) + 0.5);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp18_ = self->priv->crop_width;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp19_ = pw;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp18_ < _tmp19_) {
-#line 1904 "page.c"
-		gint _tmp20_;
-		gint _tmp21_;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp20_ = pw;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = self->priv->crop_width;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->crop_x = (_tmp20_ - _tmp21_) / 2;
-#line 1913 "page.c"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp15_ = w;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp16_ = self->priv->_dpi;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_width (self, (gint) ((_tmp15_ * _tmp16_) + 0.5));
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp17_ = h;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp18_ = self->priv->_dpi;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_height (self, (gint) ((_tmp17_ * _tmp18_) + 0.5));
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp19_ = self->priv->_crop_width;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp20_ = pw;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp19_ < _tmp20_) {
+#line 1502 "page.c"
+		gint _tmp21_ = 0;
+		gint _tmp22_ = 0;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp21_ = pw;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp22_ = self->priv->_crop_width;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_crop_x (self, (_tmp21_ - _tmp22_) / 2);
+#line 1511 "page.c"
 	} else {
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->crop_x = 0;
-#line 1917 "page.c"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_crop_x (self, 0);
+#line 1515 "page.c"
 	}
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp22_ = self->priv->crop_height;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp23_ = ph;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp22_ < _tmp23_) {
-#line 1925 "page.c"
-		gint _tmp24_;
-		gint _tmp25_;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = ph;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = self->priv->crop_height;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->crop_y = (_tmp24_ - _tmp25_) / 2;
-#line 1934 "page.c"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp23_ = self->priv->_crop_height;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp24_ = ph;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp23_ < _tmp24_) {
+#line 1523 "page.c"
+		gint _tmp25_ = 0;
+		gint _tmp26_ = 0;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp25_ = ph;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_ = self->priv->_crop_height;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_crop_y (self, (_tmp25_ - _tmp26_) / 2);
+#line 1532 "page.c"
 	} else {
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->crop_y = 0;
-#line 1938 "page.c"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		page_set_crop_y (self, 0);
+#line 1536 "page.c"
 	}
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1942 "page.c"
+#line 1540 "page.c"
 }
 
 
 void page_move_crop (Page* self, gint x, gint y) {
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-	gint _tmp4_;
+	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-	gint _tmp6_;
-	gint _tmp7_;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = x;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp0_ >= 0);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = y;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp1_ >= 0);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = x;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = page_get_width (self);
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp2_ < _tmp3_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = y;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = page_get_height (self);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (_tmp4_ < _tmp5_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp6_ = x;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_x = _tmp6_;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = y;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_y = _tmp7_;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp4_ = _tmp3_;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (_tmp2_ < _tmp4_);
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = y;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp6_ = page_get_height (self);
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp7_ = _tmp6_;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (_tmp5_ < _tmp7_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp8_ = x;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_x (self, _tmp8_);
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp9_ = y;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_y (self, _tmp9_);
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1987 "page.c"
+#line 1591 "page.c"
 }
 
 
 void page_rotate_crop (Page* self) {
+	gboolean _tmp0_ = FALSE;
 	gint t = 0;
-	gboolean _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	const gchar* _tmp4_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	const gchar* _tmp4_ = NULL;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->has_crop_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_has_crop;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!_tmp0_) {
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 2006 "page.c"
+#line 1610 "page.c"
 	}
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = self->priv->crop_width;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = self->priv->_crop_width;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	t = _tmp1_;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = self->priv->crop_height;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_width = _tmp2_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = self->priv->_crop_height;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_width (self, _tmp2_);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = t;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->crop_height = _tmp3_;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = self->priv->crop_name;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	page_set_crop_height (self, _tmp3_);
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp4_ = self->priv->_crop_name;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ == NULL) {
-#line 2024 "page.c"
+#line 1628 "page.c"
 		gint w = 0;
-		gint h = 0;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-		gint _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
-		gint _tmp12_;
-		gint _tmp14_;
-		gint _tmp15_;
-		gint _tmp16_;
-		gint _tmp19_;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint h = 0;
+		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+		gint _tmp14_ = 0;
+		gint _tmp16_ = 0;
+		gint _tmp17_ = 0;
+		gint _tmp18_ = 0;
+		gint _tmp21_ = 0;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = page_get_width (self);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		w = _tmp5_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = page_get_height (self);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		h = _tmp6_;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->crop_x;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = self->priv->crop_width;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = w;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if ((_tmp7_ + _tmp8_) > _tmp9_) {
-#line 2053 "page.c"
-			gint _tmp10_;
-			gint _tmp11_;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp10_ = w;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp11_ = self->priv->crop_width;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			self->priv->crop_x = _tmp10_ - _tmp11_;
-#line 2062 "page.c"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = _tmp5_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		w = _tmp6_;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp7_ = page_get_height (self);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp8_ = _tmp7_;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		h = _tmp8_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp9_ = self->priv->_crop_x;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp10_ = self->priv->_crop_width;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp11_ = w;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if ((_tmp9_ + _tmp10_) > _tmp11_) {
+#line 1663 "page.c"
+			gint _tmp12_ = 0;
+			gint _tmp13_ = 0;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp12_ = w;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp13_ = self->priv->_crop_width;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_crop_x (self, _tmp12_ - _tmp13_);
+#line 1672 "page.c"
 		}
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = self->priv->crop_x;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp12_ < 0) {
-#line 2068 "page.c"
-			gint _tmp13_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			self->priv->crop_x = 0;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp13_ = w;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			self->priv->crop_width = _tmp13_;
-#line 2076 "page.c"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp14_ = self->priv->_crop_x;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp14_ < 0) {
+#line 1678 "page.c"
+			gint _tmp15_ = 0;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_crop_x (self, 0);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp15_ = w;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_crop_width (self, _tmp15_);
+#line 1686 "page.c"
 		}
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp14_ = self->priv->crop_y;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_ = self->priv->crop_height;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = h;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if ((_tmp14_ + _tmp15_) > _tmp16_) {
-#line 2086 "page.c"
-			gint _tmp17_;
-			gint _tmp18_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp17_ = h;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp18_ = self->priv->crop_height;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			self->priv->crop_y = _tmp17_ - _tmp18_;
-#line 2095 "page.c"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_ = self->priv->_crop_y;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp17_ = self->priv->_crop_height;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp18_ = h;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if ((_tmp16_ + _tmp17_) > _tmp18_) {
+#line 1696 "page.c"
+			gint _tmp19_ = 0;
+			gint _tmp20_ = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp19_ = h;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp20_ = self->priv->_crop_height;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_crop_y (self, _tmp19_ - _tmp20_);
+#line 1705 "page.c"
 		}
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp19_ = self->priv->crop_y;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp19_ < 0) {
-#line 2101 "page.c"
-			gint _tmp20_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			self->priv->crop_y = 0;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp20_ = h;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			self->priv->crop_height = _tmp20_;
-#line 2109 "page.c"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp21_ = self->priv->_crop_y;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp21_ < 0) {
+#line 1711 "page.c"
+			gint _tmp22_ = 0;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_crop_y (self, 0);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp22_ = h;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			page_set_crop_height (self, _tmp22_);
+#line 1719 "page.c"
 		}
 	}
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 2114 "page.c"
-}
-
-
-gboolean page_has_crop (Page* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->has_crop_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp0_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 2129 "page.c"
-}
-
-
-void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height) {
-	gint _vala_x = 0;
-	gint _vala_y = 0;
-	gint _vala_width = 0;
-	gint _vala_height = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->crop_x;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_vala_x = _tmp0_;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = self->priv->crop_y;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_vala_y = _tmp1_;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = self->priv->crop_width;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_vala_width = _tmp2_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = self->priv->crop_height;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_vala_height = _tmp3_;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (x) {
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*x = _vala_x;
-#line 2164 "page.c"
-	}
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (y) {
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*y = _vala_y;
-#line 2170 "page.c"
-	}
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (width) {
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*width = _vala_width;
-#line 2176 "page.c"
-	}
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (height) {
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		*height = _vala_height;
-#line 2182 "page.c"
-	}
-}
-
-
-gchar* page_get_named_crop (Page* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = self->priv->crop_name;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	result = _tmp1_;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return result;
-#line 2201 "page.c"
+#line 1724 "page.c"
 }
 
 
 guchar* page_get_pixels (Page* self, int* result_length1) {
 	guchar* result = NULL;
-	guchar* _tmp0_;
-	gint _tmp0__length1;
-	guchar* _tmp1_;
-	gint _tmp1__length1;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	guchar* _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	guchar* _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->pixels;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0__length1 = self->priv->pixels_length1;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (result_length1) {
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*result_length1 = _tmp1__length1;
-#line 2225 "page.c"
+#line 1748 "page.c"
 	}
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 2231 "page.c"
-}
-
-
-static guchar* _vala_array_dup3 (guchar* self, int length) {
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	return g_memdup (self, length * sizeof (guchar));
-#line 2238 "page.c"
-}
-
-
-void page_set_pixels (Page* self, guchar* new_pixels, int new_pixels_length1) {
-	guchar* _tmp0_;
-	gint _tmp0__length1;
-	guchar* _tmp1_;
-	gint _tmp1__length1;
-	guchar* _tmp2_;
-	gint _tmp2__length1;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_return_if_fail (self != NULL);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0_ = new_pixels;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp0__length1 = new_pixels_length1;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels = (g_free (self->priv->pixels), NULL);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels = _tmp1_;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->pixels_length1 = _tmp1__length1;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->_pixels_size_ = self->priv->pixels_length1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2_ = new_pixels;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp2__length1 = new_pixels_length1;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->has_data_ = _tmp2_ != NULL;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	g_signal_emit_by_name (self, "pixels-changed");
-#line 2275 "page.c"
+#line 1754 "page.c"
 }
 
 
 static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint n_channels, gint channel) {
 	guchar result = '\0';
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = (guchar) 0xFF;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 2287 "page.c"
+#line 1766 "page.c"
 }
 
 
 static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel_length1, gint offset) {
 	ScanDirection _tmp0_ = 0;
-	gint _tmp13_ = 0;
-	gint depth;
+	ScanDirection _tmp1_ = 0;
+	gint line_offset = 0;
 	gint _tmp14_ = 0;
-	gint n_channels;
 	gint _tmp15_ = 0;
-	gint _tmp16_;
-	gint line_offset;
-	gboolean _tmp17_ = FALSE;
-	gint _tmp18_;
-	gboolean _tmp20_;
-	guchar* _tmp104_;
-	gint _tmp104__length1;
-	gint _tmp105_;
-	guchar* _tmp106_;
-	gint _tmp106__length1;
-	gint _tmp107_;
-	gint _tmp108_;
-	gint _tmp109_;
-	gint _tmp110_;
+	gboolean _tmp16_ = FALSE;
+	gint _tmp17_ = 0;
+	gboolean _tmp19_ = FALSE;
+	guchar* _tmp103_ = NULL;
+	gint _tmp103__length1 = 0;
+	gint _tmp104_ = 0;
+	guchar* _tmp105_ = NULL;
+	gint _tmp105__length1 = 0;
+	gint _tmp106_ = 0;
+	gint _tmp107_ = 0;
+	gint _tmp108_ = 0;
+	gint _tmp109_ = 0;
+	guchar _tmp110_ = '\0';
 	guchar _tmp111_ = '\0';
-	guchar _tmp112_;
-	guchar* _tmp113_;
-	gint _tmp113__length1;
-	gint _tmp114_;
-	guchar* _tmp115_;
-	gint _tmp115__length1;
-	gint _tmp116_;
-	gint _tmp117_;
-	gint _tmp118_;
-	gint _tmp119_;
+	guchar* _tmp112_ = NULL;
+	gint _tmp112__length1 = 0;
+	gint _tmp113_ = 0;
+	guchar* _tmp114_ = NULL;
+	gint _tmp114__length1 = 0;
+	gint _tmp115_ = 0;
+	gint _tmp116_ = 0;
+	gint _tmp117_ = 0;
+	gint _tmp118_ = 0;
+	guchar _tmp119_ = '\0';
 	guchar _tmp120_ = '\0';
-	guchar _tmp121_;
-	guchar* _tmp122_;
-	gint _tmp122__length1;
-	gint _tmp123_;
-	guchar* _tmp124_;
-	gint _tmp124__length1;
-	gint _tmp125_;
-	gint _tmp126_;
-	gint _tmp127_;
-	gint _tmp128_;
+	guchar* _tmp121_ = NULL;
+	gint _tmp121__length1 = 0;
+	gint _tmp122_ = 0;
+	guchar* _tmp123_ = NULL;
+	gint _tmp123__length1 = 0;
+	gint _tmp124_ = 0;
+	gint _tmp125_ = 0;
+	gint _tmp126_ = 0;
+	gint _tmp127_ = 0;
+	guchar _tmp128_ = '\0';
 	guchar _tmp129_ = '\0';
-	guchar _tmp130_;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_scan_direction (self);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	switch (_tmp0_) {
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = _tmp0_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	switch (_tmp1_) {
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 2344 "page.c"
+#line 1822 "page.c"
 		{
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 2348 "page.c"
+#line 1826 "page.c"
 		}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 2352 "page.c"
+#line 1830 "page.c"
 		{
-			gint _tmp1_ = 0;
-			gint _tmp2_;
+			gint _tmp2_ = 0;
 			gint _tmp3_ = 0;
-			gint _tmp4_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp1_ = page_get_scan_width (self);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp2_ = x;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			x = (_tmp1_ - _tmp2_) - 1;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp3_ = page_get_scan_height (self);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp4_ = y;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			y = (_tmp3_ - _tmp4_) - 1;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gint _tmp4_ = 0;
+			gint _tmp5_ = 0;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp2_ = self->priv->_scan_width;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp3_ = x;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			x = (_tmp2_ - _tmp3_) - 1;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp4_ = self->priv->_scan_height;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp5_ = y;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			y = (_tmp4_ - _tmp5_) - 1;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 2372 "page.c"
+#line 1850 "page.c"
 		}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 2376 "page.c"
+#line 1854 "page.c"
 		{
-			gint _tmp5_;
-			gint t;
+			gint t = 0;
 			gint _tmp6_ = 0;
-			gint _tmp7_;
-			gint _tmp8_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp5_ = x;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			t = _tmp5_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp6_ = page_get_scan_width (self);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp7_ = y;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			x = (_tmp6_ - _tmp7_) - 1;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp8_ = t;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			y = _tmp8_;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gint _tmp7_ = 0;
+			gint _tmp8_ = 0;
+			gint _tmp9_ = 0;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp6_ = x;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			t = _tmp6_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp7_ = self->priv->_scan_width;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp8_ = y;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			x = (_tmp7_ - _tmp8_) - 1;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp9_ = t;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			y = _tmp9_;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 2399 "page.c"
+#line 1877 "page.c"
 		}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 2403 "page.c"
+#line 1881 "page.c"
 		{
-			gint _tmp9_;
-			gint t;
-			gint _tmp10_;
+			gint t = 0;
+			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-			gint _tmp12_;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp9_ = x;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			t = _tmp9_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp10_ = y;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			x = _tmp10_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp11_ = page_get_scan_height (self);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp12_ = t;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			y = (_tmp11_ - _tmp12_) - 1;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gint _tmp12_ = 0;
+			gint _tmp13_ = 0;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp10_ = x;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			t = _tmp10_;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp11_ = y;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			x = _tmp11_;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp12_ = self->priv->_scan_height;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp13_ = t;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			y = (_tmp12_ - _tmp13_) - 1;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 2426 "page.c"
+#line 1904 "page.c"
 		}
 		default:
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
-#line 2431 "page.c"
+#line 1909 "page.c"
 	}
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp13_ = page_get_depth (self);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	depth = _tmp13_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = page_get_n_channels (self);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	n_channels = _tmp14_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = page_get_rowstride (self);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp16_ = y;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	line_offset = _tmp15_ * _tmp16_;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp18_ = depth;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp18_ == 8) {
-#line 2451 "page.c"
-		gint _tmp19_;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp19_ = n_channels;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp17_ = _tmp19_ == 3;
-#line 2457 "page.c"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp14_ = self->priv->_rowstride;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp15_ = y;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	line_offset = _tmp14_ * _tmp15_;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp17_ = self->priv->_depth;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp17_ == 8) {
+#line 1921 "page.c"
+		gint _tmp18_ = 0;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp18_ = self->priv->_n_channels;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_ = _tmp18_ == 3;
+#line 1927 "page.c"
 	} else {
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp17_ = FALSE;
-#line 2461 "page.c"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_ = FALSE;
+#line 1931 "page.c"
 	}
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp20_ = _tmp17_;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp20_) {
-#line 2467 "page.c"
-		gint _tmp21_;
-		gint _tmp22_;
-		gint _tmp23_;
-		gint o;
-		guchar* _tmp24_;
-		gint _tmp24__length1;
-		gint _tmp25_;
-		guchar* _tmp26_;
-		gint _tmp26__length1;
-		gint _tmp27_;
-		guchar _tmp28_;
-		guchar _tmp29_;
-		guchar* _tmp30_;
-		gint _tmp30__length1;
-		gint _tmp31_;
-		guchar* _tmp32_;
-		gint _tmp32__length1;
-		gint _tmp33_;
-		guchar _tmp34_;
-		guchar _tmp35_;
-		guchar* _tmp36_;
-		gint _tmp36__length1;
-		gint _tmp37_;
-		guchar* _tmp38_;
-		gint _tmp38__length1;
-		gint _tmp39_;
-		guchar _tmp40_;
-		guchar _tmp41_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = line_offset;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = x;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = n_channels;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		o = _tmp21_ + (_tmp22_ * _tmp23_);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = pixel;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24__length1 = pixel_length1;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = offset;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26_ = self->priv->pixels;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26__length1 = self->priv->pixels_length1;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp27_ = o;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp28_ = _tmp26_[_tmp27_];
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_[_tmp25_ + 0] = _tmp28_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp29_ = _tmp24_[_tmp25_ + 0];
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30_ = pixel;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30__length1 = pixel_length1;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp31_ = offset;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp32_ = self->priv->pixels;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp32__length1 = self->priv->pixels_length1;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp33_ = o;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp34_ = _tmp32_[_tmp33_ + 1];
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30_[_tmp31_ + 1] = _tmp34_;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp35_ = _tmp30_[_tmp31_ + 1];
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp36_ = pixel;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp36__length1 = pixel_length1;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp37_ = offset;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp38_ = self->priv->pixels;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp38__length1 = self->priv->pixels_length1;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp39_ = o;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp40_ = _tmp38_[_tmp39_ + 2];
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp36_[_tmp37_ + 2] = _tmp40_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp41_ = _tmp36_[_tmp37_ + 2];
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp19_ = _tmp16_;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp19_) {
+#line 1937 "page.c"
+		gint o = 0;
+		gint _tmp20_ = 0;
+		gint _tmp21_ = 0;
+		gint _tmp22_ = 0;
+		guchar* _tmp23_ = NULL;
+		gint _tmp23__length1 = 0;
+		gint _tmp24_ = 0;
+		guchar* _tmp25_ = NULL;
+		gint _tmp25__length1 = 0;
+		gint _tmp26_ = 0;
+		guchar _tmp27_ = '\0';
+		guchar _tmp28_ = '\0';
+		guchar* _tmp29_ = NULL;
+		gint _tmp29__length1 = 0;
+		gint _tmp30_ = 0;
+		guchar* _tmp31_ = NULL;
+		gint _tmp31__length1 = 0;
+		gint _tmp32_ = 0;
+		guchar _tmp33_ = '\0';
+		guchar _tmp34_ = '\0';
+		guchar* _tmp35_ = NULL;
+		gint _tmp35__length1 = 0;
+		gint _tmp36_ = 0;
+		guchar* _tmp37_ = NULL;
+		gint _tmp37__length1 = 0;
+		gint _tmp38_ = 0;
+		guchar _tmp39_ = '\0';
+		guchar _tmp40_ = '\0';
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp20_ = line_offset;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp21_ = x;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp22_ = self->priv->_n_channels;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		o = _tmp20_ + (_tmp21_ * _tmp22_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp23_ = pixel;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp23__length1 = pixel_length1;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp24_ = offset;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp25_ = self->priv->pixels;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp25__length1 = self->priv->pixels_length1;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_ = o;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp27_ = _tmp25_[_tmp26_];
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp23_[_tmp24_ + 0] = _tmp27_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp28_ = _tmp23_[_tmp24_ + 0];
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp29_ = pixel;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp29__length1 = pixel_length1;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp30_ = offset;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp31_ = self->priv->pixels;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp31__length1 = self->priv->pixels_length1;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp32_ = o;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp33_ = _tmp31_[_tmp32_ + 1];
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp29_[_tmp30_ + 1] = _tmp33_;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp34_ = _tmp29_[_tmp30_ + 1];
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp35_ = pixel;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp35__length1 = pixel_length1;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp36_ = offset;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp37_ = self->priv->pixels;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp37__length1 = self->priv->pixels_length1;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp38_ = o;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp39_ = _tmp37_[_tmp38_ + 2];
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp35_[_tmp36_ + 2] = _tmp39_;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp40_ = _tmp35_[_tmp36_ + 2];
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 2560 "page.c"
+#line 2030 "page.c"
 	} else {
-		gboolean _tmp42_ = FALSE;
-		gint _tmp43_;
-		gboolean _tmp45_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp43_ = depth;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp43_ == 8) {
-#line 2569 "page.c"
-			gint _tmp44_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp44_ = n_channels;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp42_ = _tmp44_ == 1;
-#line 2575 "page.c"
+		gboolean _tmp41_ = FALSE;
+		gint _tmp42_ = 0;
+		gboolean _tmp44_ = FALSE;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp42_ = self->priv->_depth;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp42_ == 8) {
+#line 2039 "page.c"
+			gint _tmp43_ = 0;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp43_ = self->priv->_n_channels;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp41_ = _tmp43_ == 1;
+#line 2045 "page.c"
 		} else {
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp42_ = FALSE;
-#line 2579 "page.c"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp41_ = FALSE;
+#line 2049 "page.c"
 		}
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp45_ = _tmp42_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp45_) {
-#line 2585 "page.c"
-			guchar* _tmp46_;
-			gint _tmp46__length1;
-			gint _tmp47_;
-			gint _tmp48_;
-			guchar _tmp49_;
-			guchar p;
-			guchar* _tmp50_;
-			gint _tmp50__length1;
-			gint _tmp51_;
-			guchar* _tmp52_;
-			gint _tmp52__length1;
-			gint _tmp53_;
-			guchar* _tmp54_;
-			gint _tmp54__length1;
-			gint _tmp55_;
-			guchar _tmp56_;
-			guchar _tmp57_;
-			guchar _tmp58_;
-			guchar _tmp59_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp46_ = self->priv->pixels;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp46__length1 = self->priv->pixels_length1;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp47_ = line_offset;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp48_ = x;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp49_ = _tmp46_[_tmp47_ + _tmp48_];
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			p = _tmp49_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp50_ = pixel;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp50__length1 = pixel_length1;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51_ = offset;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp52_ = pixel;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp52__length1 = pixel_length1;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp53_ = offset;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp54_ = pixel;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp54__length1 = pixel_length1;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp55_ = offset;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp56_ = p;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp54_[_tmp55_ + 2] = _tmp56_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp57_ = _tmp54_[_tmp55_ + 2];
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp52_[_tmp53_ + 1] = _tmp57_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp58_ = _tmp52_[_tmp53_ + 1];
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp50_[_tmp51_ + 0] = _tmp58_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp59_ = _tmp50_[_tmp51_ + 0];
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp44_ = _tmp41_;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp44_) {
+#line 2055 "page.c"
+			guchar p = '\0';
+			guchar* _tmp45_ = NULL;
+			gint _tmp45__length1 = 0;
+			gint _tmp46_ = 0;
+			gint _tmp47_ = 0;
+			guchar _tmp48_ = '\0';
+			guchar* _tmp49_ = NULL;
+			gint _tmp49__length1 = 0;
+			gint _tmp50_ = 0;
+			guchar* _tmp51_ = NULL;
+			gint _tmp51__length1 = 0;
+			gint _tmp52_ = 0;
+			guchar* _tmp53_ = NULL;
+			gint _tmp53__length1 = 0;
+			gint _tmp54_ = 0;
+			guchar _tmp55_ = '\0';
+			guchar _tmp56_ = '\0';
+			guchar _tmp57_ = '\0';
+			guchar _tmp58_ = '\0';
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp45_ = self->priv->pixels;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp45__length1 = self->priv->pixels_length1;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp46_ = line_offset;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp47_ = x;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp48_ = _tmp45_[_tmp46_ + _tmp47_];
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			p = _tmp48_;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp49_ = pixel;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp49__length1 = pixel_length1;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp50_ = offset;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp51_ = pixel;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp51__length1 = pixel_length1;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp52_ = offset;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp53_ = pixel;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp53__length1 = pixel_length1;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp54_ = offset;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp55_ = p;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp53_[_tmp54_ + 2] = _tmp55_;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp56_ = _tmp53_[_tmp54_ + 2];
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp51_[_tmp52_ + 1] = _tmp56_;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp57_ = _tmp51_[_tmp52_ + 1];
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp49_[_tmp50_ + 0] = _tmp57_;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp58_ = _tmp49_[_tmp50_ + 0];
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
-#line 2651 "page.c"
+#line 2121 "page.c"
 		} else {
-			gboolean _tmp60_ = FALSE;
-			gint _tmp61_;
-			gboolean _tmp63_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp61_ = depth;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp61_ == 1) {
-#line 2660 "page.c"
-				gint _tmp62_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp62_ = n_channels;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_ = _tmp62_ == 1;
-#line 2666 "page.c"
+			gboolean _tmp59_ = FALSE;
+			gint _tmp60_ = 0;
+			gboolean _tmp62_ = FALSE;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp60_ = self->priv->_depth;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			if (_tmp60_ == 1) {
+#line 2130 "page.c"
+				gint _tmp61_ = 0;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp61_ = self->priv->_n_channels;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp59_ = _tmp61_ == 1;
+#line 2136 "page.c"
 			} else {
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp60_ = FALSE;
-#line 2670 "page.c"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp59_ = FALSE;
+#line 2140 "page.c"
 			}
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp63_ = _tmp60_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp63_) {
-#line 2676 "page.c"
-				guchar* _tmp64_;
-				gint _tmp64__length1;
-				gint _tmp65_;
-				gint _tmp66_;
-				guchar _tmp67_;
-				guchar p;
-				gint _tmp68_ = 0;
-				guchar _tmp69_;
-				gint _tmp70_;
-				guchar* _tmp71_;
-				gint _tmp71__length1;
-				gint _tmp72_;
-				guchar* _tmp73_;
-				gint _tmp73__length1;
-				gint _tmp74_;
-				guchar* _tmp75_;
-				gint _tmp75__length1;
-				gint _tmp76_;
-				gint _tmp77_;
-				guchar _tmp78_;
-				guchar _tmp79_;
-				guchar _tmp80_;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp64_ = self->priv->pixels;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp64__length1 = self->priv->pixels_length1;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp65_ = line_offset;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp66_ = x;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp67_ = _tmp64_[_tmp65_ + (_tmp66_ / 8)];
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				p = _tmp67_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp69_ = p;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp70_ = x;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (((gint) (_tmp69_ & (0x80 >> (_tmp70_ % 8)))) != 0) {
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp68_ = 0x00;
-#line 2719 "page.c"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp62_ = _tmp59_;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			if (_tmp62_) {
+#line 2146 "page.c"
+				guchar p = '\0';
+				guchar* _tmp63_ = NULL;
+				gint _tmp63__length1 = 0;
+				gint _tmp64_ = 0;
+				gint _tmp65_ = 0;
+				guchar _tmp66_ = '\0';
+				gint _tmp67_ = 0;
+				guchar _tmp68_ = '\0';
+				gint _tmp69_ = 0;
+				guchar* _tmp70_ = NULL;
+				gint _tmp70__length1 = 0;
+				gint _tmp71_ = 0;
+				guchar* _tmp72_ = NULL;
+				gint _tmp72__length1 = 0;
+				gint _tmp73_ = 0;
+				guchar* _tmp74_ = NULL;
+				gint _tmp74__length1 = 0;
+				gint _tmp75_ = 0;
+				gint _tmp76_ = 0;
+				guchar _tmp77_ = '\0';
+				guchar _tmp78_ = '\0';
+				guchar _tmp79_ = '\0';
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp63_ = self->priv->pixels;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp63__length1 = self->priv->pixels_length1;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp64_ = line_offset;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp65_ = x;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp66_ = _tmp63_[_tmp64_ + (_tmp65_ / 8)];
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				p = _tmp66_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp68_ = p;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp69_ = x;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				if (((gint) (_tmp68_ & (0x80 >> (_tmp69_ % 8)))) != 0) {
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp67_ = 0x00;
+#line 2189 "page.c"
 				} else {
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp68_ = 0xFF;
-#line 2723 "page.c"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp67_ = 0xFF;
+#line 2193 "page.c"
 				}
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71_ = pixel;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71__length1 = pixel_length1;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp72_ = offset;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp73_ = pixel;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp73__length1 = pixel_length1;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74_ = offset;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75_ = pixel;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75__length1 = pixel_length1;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp76_ = offset;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp77_ = _tmp68_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75_[_tmp76_ + 2] = (guchar) _tmp77_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp78_ = _tmp75_[_tmp76_ + 2];
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp73_[_tmp74_ + 1] = _tmp78_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp79_ = _tmp73_[_tmp74_ + 1];
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71_[_tmp72_ + 0] = _tmp79_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp80_ = _tmp71_[_tmp72_ + 0];
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp70_ = pixel;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp70__length1 = pixel_length1;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp71_ = offset;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp72_ = pixel;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp72__length1 = pixel_length1;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp73_ = offset;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp74_ = pixel;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp74__length1 = pixel_length1;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp75_ = offset;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp76_ = _tmp67_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp74_[_tmp75_ + 2] = (guchar) _tmp76_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp77_ = _tmp74_[_tmp75_ + 2];
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp72_[_tmp73_ + 1] = _tmp77_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp78_ = _tmp72_[_tmp73_ + 1];
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp70_[_tmp71_ + 0] = _tmp78_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp79_ = _tmp70_[_tmp71_ + 0];
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
-#line 2759 "page.c"
+#line 2229 "page.c"
 			} else {
-				gboolean _tmp81_ = FALSE;
-				gint _tmp82_;
-				gboolean _tmp84_;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp82_ = depth;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp82_ == 2) {
-#line 2768 "page.c"
-					gint _tmp83_;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp83_ = n_channels;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp81_ = _tmp83_ == 1;
-#line 2774 "page.c"
+				gboolean _tmp80_ = FALSE;
+				gint _tmp81_ = 0;
+				gboolean _tmp83_ = FALSE;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp81_ = self->priv->_depth;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				if (_tmp81_ == 2) {
+#line 2238 "page.c"
+					gint _tmp82_ = 0;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp82_ = self->priv->_n_channels;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp80_ = _tmp82_ == 1;
+#line 2244 "page.c"
 				} else {
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp81_ = FALSE;
-#line 2778 "page.c"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp80_ = FALSE;
+#line 2248 "page.c"
 				}
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp84_ = _tmp81_;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp84_) {
-#line 2784 "page.c"
-					gint _tmp85_[4] = {0};
-					gint block_shift[4];
-					guchar* _tmp86_;
-					gint _tmp86__length1;
-					gint _tmp87_;
-					gint _tmp88_;
-					guchar _tmp89_;
-					guchar p;
-					guchar _tmp90_;
-					gint _tmp91_;
-					gint _tmp92_;
-					gint sample;
-					gint _tmp93_;
-					guchar* _tmp94_;
-					gint _tmp94__length1;
-					gint _tmp95_;
-					guchar* _tmp96_;
-					gint _tmp96__length1;
-					gint _tmp97_;
-					guchar* _tmp98_;
-					gint _tmp98__length1;
-					gint _tmp99_;
-					gint _tmp100_;
-					guchar _tmp101_;
-					guchar _tmp102_;
-					guchar _tmp103_;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85_[0] = 6;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85_[1] = 4;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85_[2] = 2;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85_[3] = 0;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					memcpy (block_shift, _tmp85_, 4 * sizeof (gint));
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp86_ = self->priv->pixels;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp86__length1 = self->priv->pixels_length1;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp87_ = line_offset;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp88_ = x;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp89_ = _tmp86_[_tmp87_ + (_tmp88_ / 4)];
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					p = _tmp89_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp90_ = p;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp91_ = x;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp92_ = block_shift[_tmp91_ % 4];
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					sample = (_tmp90_ >> _tmp92_) & 0x3;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp93_ = sample;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					sample = (_tmp93_ * 255) / 3;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp94_ = pixel;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp94__length1 = pixel_length1;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp95_ = offset;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp96_ = pixel;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp96__length1 = pixel_length1;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp97_ = offset;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp98_ = pixel;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp98__length1 = pixel_length1;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp99_ = offset;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp100_ = sample;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp98_[_tmp99_ + 2] = (guchar) _tmp100_;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp101_ = _tmp98_[_tmp99_ + 2];
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp96_[_tmp97_ + 1] = _tmp101_;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp102_ = _tmp96_[_tmp97_ + 1];
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp94_[_tmp95_ + 0] = _tmp102_;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp103_ = _tmp94_[_tmp95_ + 0];
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp83_ = _tmp80_;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				if (_tmp83_) {
+#line 2254 "page.c"
+					gint block_shift[4] = {0};
+					gint _tmp84_[4] = {0};
+					guchar p = '\0';
+					guchar* _tmp85_ = NULL;
+					gint _tmp85__length1 = 0;
+					gint _tmp86_ = 0;
+					gint _tmp87_ = 0;
+					guchar _tmp88_ = '\0';
+					gint sample = 0;
+					guchar _tmp89_ = '\0';
+					gint _tmp90_ = 0;
+					gint _tmp91_ = 0;
+					gint _tmp92_ = 0;
+					guchar* _tmp93_ = NULL;
+					gint _tmp93__length1 = 0;
+					gint _tmp94_ = 0;
+					guchar* _tmp95_ = NULL;
+					gint _tmp95__length1 = 0;
+					gint _tmp96_ = 0;
+					guchar* _tmp97_ = NULL;
+					gint _tmp97__length1 = 0;
+					gint _tmp98_ = 0;
+					gint _tmp99_ = 0;
+					guchar _tmp100_ = '\0';
+					guchar _tmp101_ = '\0';
+					guchar _tmp102_ = '\0';
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp84_[0] = 6;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp84_[1] = 4;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp84_[2] = 2;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp84_[3] = 0;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					memcpy (block_shift, _tmp84_, 4 * sizeof (gint));
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp85_ = self->priv->pixels;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp85__length1 = self->priv->pixels_length1;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp86_ = line_offset;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp87_ = x;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp88_ = _tmp85_[_tmp86_ + (_tmp87_ / 4)];
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					p = _tmp88_;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp89_ = p;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp90_ = x;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp91_ = block_shift[_tmp90_ % 4];
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					sample = (_tmp89_ >> _tmp91_) & 0x3;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp92_ = sample;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					sample = (_tmp92_ * 255) / 3;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp93_ = pixel;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp93__length1 = pixel_length1;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp94_ = offset;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp95_ = pixel;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp95__length1 = pixel_length1;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp96_ = offset;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp97_ = pixel;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp97__length1 = pixel_length1;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp98_ = offset;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp99_ = sample;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp97_[_tmp98_ + 2] = (guchar) _tmp99_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp100_ = _tmp97_[_tmp98_ + 2];
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp95_[_tmp96_ + 1] = _tmp100_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp101_ = _tmp95_[_tmp96_ + 1];
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp93_[_tmp94_ + 0] = _tmp101_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp102_ = _tmp93_[_tmp94_ + 0];
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
-#line 2879 "page.c"
+#line 2349 "page.c"
 				}
 			}
 		}
 	}
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp104_ = pixel;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp104__length1 = pixel_length1;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp105_ = offset;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp106_ = self->priv->pixels;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp106__length1 = self->priv->pixels_length1;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp107_ = line_offset;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp108_ = x;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp109_ = depth;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp110_ = n_channels;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp111_ = page_get_sample (self, _tmp106_, _tmp106__length1, _tmp107_, _tmp108_, _tmp109_, _tmp110_, 0);
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp104_[_tmp105_ + 0] = _tmp111_;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp112_ = _tmp104_[_tmp105_ + 0];
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp113_ = pixel;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp113__length1 = pixel_length1;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp114_ = offset;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp115_ = self->priv->pixels;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp115__length1 = self->priv->pixels_length1;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp116_ = line_offset;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp117_ = x;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp118_ = depth;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp119_ = n_channels;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp120_ = page_get_sample (self, _tmp115_, _tmp115__length1, _tmp116_, _tmp117_, _tmp118_, _tmp119_, 1);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp113_[_tmp114_ + 1] = _tmp120_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp121_ = _tmp113_[_tmp114_ + 1];
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp122_ = pixel;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp122__length1 = pixel_length1;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp123_ = offset;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp124_ = self->priv->pixels;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp124__length1 = self->priv->pixels_length1;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp125_ = line_offset;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp126_ = x;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp127_ = depth;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp128_ = n_channels;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp129_ = page_get_sample (self, _tmp124_, _tmp124__length1, _tmp125_, _tmp126_, _tmp127_, _tmp128_, 2);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp122_[_tmp123_ + 2] = _tmp129_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp130_ = _tmp122_[_tmp123_ + 2];
-#line 2956 "page.c"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp103_ = pixel;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp103__length1 = pixel_length1;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp104_ = offset;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp105_ = self->priv->pixels;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp105__length1 = self->priv->pixels_length1;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp106_ = line_offset;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp107_ = x;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp108_ = self->priv->_depth;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp109_ = self->priv->_n_channels;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp110_ = page_get_sample (self, _tmp105_, _tmp105__length1, _tmp106_, _tmp107_, _tmp108_, _tmp109_, 0);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp103_[_tmp104_ + 0] = _tmp110_;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp111_ = _tmp103_[_tmp104_ + 0];
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp112_ = pixel;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp112__length1 = pixel_length1;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp113_ = offset;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp114_ = self->priv->pixels;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp114__length1 = self->priv->pixels_length1;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp115_ = line_offset;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp116_ = x;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp117_ = self->priv->_depth;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp118_ = self->priv->_n_channels;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp119_ = page_get_sample (self, _tmp114_, _tmp114__length1, _tmp115_, _tmp116_, _tmp117_, _tmp118_, 1);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp112_[_tmp113_ + 1] = _tmp119_;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp120_ = _tmp112_[_tmp113_ + 1];
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp121_ = pixel;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp121__length1 = pixel_length1;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp122_ = offset;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp123_ = self->priv->pixels;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp123__length1 = self->priv->pixels_length1;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp124_ = line_offset;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp125_ = x;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp126_ = self->priv->_depth;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp127_ = self->priv->_n_channels;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp128_ = page_get_sample (self, _tmp123_, _tmp123__length1, _tmp124_, _tmp125_, _tmp126_, _tmp127_, 2);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp121_[_tmp122_ + 2] = _tmp128_;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp129_ = _tmp121_[_tmp122_ + 2];
+#line 2426 "page.c"
 }
 
 
@@ -2963,387 +2433,405 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 	gint t = 0;
 	gint b = 0;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-	gboolean _tmp3_;
-	gint _tmp20_;
-	gint _tmp21_;
-	gint _tmp22_;
-	gint _tmp23_;
-	GdkPixbuf* _tmp24_;
-	GdkPixbuf* image;
-	GdkPixbuf* _tmp25_;
-	guint8* _tmp26_ = NULL;
-	guint8* image_pixels;
-	gint image_pixels_length1;
-	gint _image_pixels_size_;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp3_ = FALSE;
+	GdkPixbuf* image = NULL;
+	gint _tmp26_ = 0;
+	gint _tmp27_ = 0;
+	gint _tmp28_ = 0;
+	gint _tmp29_ = 0;
+	GdkPixbuf* _tmp30_ = NULL;
+	guint8* image_pixels = NULL;
+	GdkPixbuf* _tmp31_ = NULL;
+	guint8* _tmp32_ = NULL;
+	gint image_pixels_length1 = 0;
+	gint _image_pixels_size_ = 0;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = apply_crop;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_) {
-#line 2986 "page.c"
-		gboolean _tmp2_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = self->priv->has_crop_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 2456 "page.c"
+		gboolean _tmp2_ = FALSE;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp2_ = self->priv->_has_crop;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_;
-#line 2992 "page.c"
+#line 2462 "page.c"
 	} else {
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
-#line 2996 "page.c"
+#line 2466 "page.c"
 	}
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp0_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
-#line 3002 "page.c"
-		gint _tmp4_;
-		gint _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-		gint _tmp11_;
+#line 2472 "page.c"
+		gint _tmp4_ = 0;
+		gint _tmp5_ = 0;
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
-		gint _tmp14_;
-		gint _tmp15_;
+		gint _tmp13_ = 0;
 		gint _tmp16_ = 0;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = self->priv->crop_x;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint _tmp17_ = 0;
+		gint _tmp18_ = 0;
+		gint _tmp19_ = 0;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp4_ = self->priv->_crop_x;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = _tmp4_;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = l;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->crop_width;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = self->priv->_crop_width;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		r = _tmp5_ + _tmp6_;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->crop_y;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp7_ = self->priv->_crop_y;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = _tmp7_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = t;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->crop_height;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp9_ = self->priv->_crop_height;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		b = _tmp8_ + _tmp9_;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = l;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp10_ < 0) {
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			l = 0;
-#line 3041 "page.c"
+#line 2513 "page.c"
 		}
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = r;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = page_get_width (self);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp11_ > _tmp12_) {
-#line 3049 "page.c"
-			gint _tmp13_ = 0;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp13_ = page_get_width (self);
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			r = _tmp13_;
-#line 3055 "page.c"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp13_ = _tmp12_;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp11_ > _tmp13_) {
+#line 2523 "page.c"
+			gint _tmp14_ = 0;
+			gint _tmp15_ = 0;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp14_ = page_get_width (self);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp15_ = _tmp14_;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			r = _tmp15_;
+#line 2532 "page.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp14_ = t;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp14_ < 0) {
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_ = t;
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp16_ < 0) {
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = 0;
-#line 3063 "page.c"
+#line 2540 "page.c"
 		}
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp15_ = b;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = page_get_height (self);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp15_ > _tmp16_) {
-#line 3071 "page.c"
-			gint _tmp17_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp17_ = page_get_height (self);
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			b = _tmp17_;
-#line 3077 "page.c"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp17_ = b;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp18_ = page_get_height (self);
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp19_ = _tmp18_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp17_ > _tmp19_) {
+#line 2550 "page.c"
+			gint _tmp20_ = 0;
+			gint _tmp21_ = 0;
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp20_ = page_get_height (self);
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp21_ = _tmp20_;
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			b = _tmp21_;
+#line 2559 "page.c"
 		}
 	} else {
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-#line 651 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint _tmp22_ = 0;
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		gint _tmp25_ = 0;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = 0;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp18_ = page_get_width (self);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		r = _tmp18_;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp22_ = page_get_width (self);
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp23_ = _tmp22_;
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		r = _tmp23_;
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = 0;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp19_ = page_get_height (self);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		b = _tmp19_;
-#line 3094 "page.c"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp24_ = page_get_height (self);
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp25_ = _tmp24_;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		b = _tmp25_;
+#line 2582 "page.c"
 	}
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp20_ = r;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp21_ = l;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp22_ = b;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp23_ = t;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp24_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp20_ - _tmp21_, _tmp22_ - _tmp23_);
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image = _tmp24_;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp25_ = image;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp26_ = gdk_pixbuf_get_pixels (_tmp25_);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image_pixels = _tmp26_;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp26_ = r;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp27_ = l;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp28_ = b;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp29_ = t;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp30_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp26_ - _tmp27_, _tmp28_ - _tmp29_);
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	image = _tmp30_;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp31_ = image;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp32_ = gdk_pixbuf_get_pixels (_tmp31_);
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	image_pixels = _tmp32_;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image_pixels_length1 = -1;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_image_pixels_size_ = image_pixels_length1;
-#line 3118 "page.c"
+#line 2606 "page.c"
 	{
-		gint _tmp27_;
-		gint y;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp27_ = t;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		y = _tmp27_;
-#line 3126 "page.c"
+		gint y = 0;
+		gint _tmp33_ = 0;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp33_ = t;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		y = _tmp33_;
+#line 2614 "page.c"
 		{
-			gboolean _tmp28_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp28_ = TRUE;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gboolean _tmp34_ = FALSE;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp34_ = TRUE;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
-#line 3133 "page.c"
-				gboolean _tmp29_;
-				gint _tmp31_;
-				gint _tmp32_;
-				GdkPixbuf* _tmp33_;
-				gint _tmp34_ = 0;
-				gint _tmp35_;
-				gint _tmp36_;
-				gint offset;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp29_ = _tmp28_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp29_) {
-#line 3146 "page.c"
-					gint _tmp30_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp30_ = y;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					y = _tmp30_ + 1;
-#line 3152 "page.c"
+#line 2621 "page.c"
+				gboolean _tmp35_ = FALSE;
+				gint _tmp37_ = 0;
+				gint _tmp38_ = 0;
+				gint offset = 0;
+				GdkPixbuf* _tmp39_ = NULL;
+				gint _tmp40_ = 0;
+				gint _tmp41_ = 0;
+				gint _tmp42_ = 0;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp35_ = _tmp34_;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				if (!_tmp35_) {
+#line 2634 "page.c"
+					gint _tmp36_ = 0;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp36_ = y;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					y = _tmp36_ + 1;
+#line 2640 "page.c"
 				}
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp28_ = FALSE;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp31_ = y;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp32_ = b;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp31_ < _tmp32_)) {
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp34_ = FALSE;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp37_ = y;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp38_ = b;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				if (!(_tmp37_ < _tmp38_)) {
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
-#line 3164 "page.c"
+#line 2652 "page.c"
 				}
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp33_ = image;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp34_ = gdk_pixbuf_get_rowstride (_tmp33_);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp35_ = y;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp36_ = t;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				offset = _tmp34_ * (_tmp35_ - _tmp36_);
-#line 3176 "page.c"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp39_ = image;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp40_ = gdk_pixbuf_get_rowstride (_tmp39_);
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp41_ = y;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp42_ = t;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				offset = _tmp40_ * (_tmp41_ - _tmp42_);
+#line 2664 "page.c"
 				{
-					gint _tmp37_;
-					gint x;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp37_ = l;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					x = _tmp37_;
-#line 3184 "page.c"
+					gint x = 0;
+					gint _tmp43_ = 0;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp43_ = l;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					x = _tmp43_;
+#line 2672 "page.c"
 					{
-						gboolean _tmp38_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-						_tmp38_ = TRUE;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+						gboolean _tmp44_ = FALSE;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+						_tmp44_ = TRUE;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 						while (TRUE) {
-#line 3191 "page.c"
-							gboolean _tmp39_;
-							gint _tmp41_;
-							gint _tmp42_;
-							gint _tmp43_;
-							gint _tmp44_;
-							guint8* _tmp45_;
-							gint _tmp45__length1;
-							gint _tmp46_;
-							gint _tmp47_;
-							gint _tmp48_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp39_ = _tmp38_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							if (!_tmp39_) {
-#line 3206 "page.c"
-								gint _tmp40_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								_tmp40_ = x;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								x = _tmp40_ + 1;
-#line 3212 "page.c"
+#line 2679 "page.c"
+							gboolean _tmp45_ = FALSE;
+							gint _tmp47_ = 0;
+							gint _tmp48_ = 0;
+							gint _tmp49_ = 0;
+							gint _tmp50_ = 0;
+							guint8* _tmp51_ = NULL;
+							gint _tmp51__length1 = 0;
+							gint _tmp52_ = 0;
+							gint _tmp53_ = 0;
+							gint _tmp54_ = 0;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp45_ = _tmp44_;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							if (!_tmp45_) {
+#line 2694 "page.c"
+								gint _tmp46_ = 0;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+								_tmp46_ = x;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+								x = _tmp46_ + 1;
+#line 2700 "page.c"
 							}
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp38_ = FALSE;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp41_ = x;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp42_ = r;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							if (!(_tmp41_ < _tmp42_)) {
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp44_ = FALSE;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp47_ = x;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp48_ = r;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							if (!(_tmp47_ < _tmp48_)) {
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								break;
-#line 3224 "page.c"
+#line 2712 "page.c"
 							}
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp43_ = x;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp44_ = y;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp45_ = image_pixels;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp45__length1 = image_pixels_length1;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp46_ = offset;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp47_ = x;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp48_ = l;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							page_get_pixel (self, _tmp43_, _tmp44_, _tmp45_, _tmp45__length1, _tmp46_ + ((_tmp47_ - _tmp48_) * 3));
-#line 3242 "page.c"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp49_ = x;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp50_ = y;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp51_ = image_pixels;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp51__length1 = image_pixels_length1;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp52_ = offset;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp53_ = x;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							_tmp54_ = l;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+							page_get_pixel (self, _tmp49_, _tmp50_, _tmp51_, _tmp51__length1, _tmp52_ + ((_tmp53_ - _tmp54_) * 3));
+#line 2730 "page.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = image;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3253 "page.c"
+#line 2741 "page.c"
 }
 
 
 static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gchar* result = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
 	gchar* _tmp2_ = NULL;
-	gchar* _result_;
-	gint _result__length1;
-	gint __result__size_;
-	gint _tmp3_;
-	gchar* _tmp4_;
-	gint _tmp4__length1;
-	gint _tmp5_;
-	gint _tmp6_;
-	gchar* _tmp7_;
-	gint _tmp7__length1;
-#line 1267 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	gint _result__length1 = 0;
+	gint __result__size_ = 0;
+	gint _tmp3_ = 0;
+	gchar* _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	gchar* _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+#line 1266 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 3308 "page.c"
+#line 2796 "page.c"
 	}
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 3314 "page.c"
+#line 2802 "page.c"
 }
 
 
 static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_filename) {
 	gchar* result = NULL;
 	gchar* contents = NULL;
-	const gchar* _tmp4_;
+	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gchar* _tmp6_ = NULL;
-	guchar* _tmp7_;
-	gint _tmp7__length1;
+	guchar* _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
 	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_;
+	gchar* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (icc_profile_filename != NULL, NULL);
-#line 3333 "page.c"
+#line 2821 "page.c"
 	{
-		const gchar* _tmp0_;
+		const gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = icc_profile_filename;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_file_get_contents (_tmp0_, &_tmp1_, NULL, &_inner_error_);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		contents = _tmp1_;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_inner_error_ != NULL) {
-#line 3347 "page.c"
+#line 2835 "page.c"
 			goto __catch3_g_error;
 		}
 	}
@@ -3351,615 +2839,1445 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	__catch3_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_;
-		const gchar* _tmp3_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		e = _inner_error_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_inner_error_ = NULL;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = e;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = _tmp2_->message;
-#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_warning ("page.vala:679: failed to get icc profile data: %s", _tmp3_);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_warning ("page.vala:637: failed to get icc profile data: %s", _tmp3_);
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = NULL;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_error_free0 (e);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3375 "page.c"
+#line 2863 "page.c"
 	}
 	__finally3:
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_clear_error (&_inner_error_);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return NULL;
-#line 3388 "page.c"
+#line 2876 "page.c"
 	}
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = contents;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = string_to_utf8 (_tmp4_, &_tmp5_);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = (guchar*) _tmp6_;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7__length1 = (_tmp5_ * sizeof (gchar)) / sizeof (guchar);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_base64_encode (_tmp7_, (_tmp5_ * sizeof (gchar)) / sizeof (guchar));
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = _tmp8_;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = (g_free (_tmp7_), NULL);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp9_;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (contents);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3410 "page.c"
+#line 2898 "page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 3417 "page.c"
+#line 2905 "page.c"
 }
 
 
 void page_copy_to_clipboard (Page* self, GtkWindow* window) {
-	GtkWindow* _tmp0_;
+	GdkDisplay* display = NULL;
+	GtkWindow* _tmp0_ = NULL;
 	GdkDisplay* _tmp1_ = NULL;
-	GdkDisplay* _tmp2_;
-	GdkDisplay* display;
+	GdkDisplay* _tmp2_ = NULL;
+	GtkClipboard* clipboard = NULL;
 	GtkClipboard* _tmp3_ = NULL;
-	GtkClipboard* _tmp4_;
-	GtkClipboard* clipboard;
+	GtkClipboard* _tmp4_ = NULL;
+	GdkPixbuf* image = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* image;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (window != NULL);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = window;
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = gtk_widget_get_display ((GtkWidget*) _tmp0_);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	display = _tmp2_;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	clipboard = _tmp4_;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = page_get_image (self, TRUE);
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp5_;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	gtk_clipboard_set_image (clipboard, image);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (image);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (clipboard);
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (display);
-#line 3461 "page.c"
+#line 2949 "page.c"
 }
 
 
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error) {
-	GFile* _tmp0_;
+	GFileOutputStream* stream = NULL;
+	GFile* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-	GFileOutputStream* stream;
-	GFileOutputStream* _tmp2_;
-	PixbufWriter* _tmp3_;
-	PixbufWriter* writer;
+	PixbufWriter* writer = NULL;
+	GFileOutputStream* _tmp2_ = NULL;
+	PixbufWriter* _tmp3_ = NULL;
+	GdkPixbuf* image = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* image;
-	gchar* icc_profile_data;
-	const gchar* _tmp5_;
-	GCompareFunc _tmp8_;
-	const gchar* _tmp9_;
+	gchar* icc_profile_data = NULL;
+	const gchar* _tmp5_ = NULL;
+	GCompareFunc _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
 	GError * _inner_error_ = NULL;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (type != NULL);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (file != NULL);
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = file;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	stream = _tmp1_;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 3498 "page.c"
+#line 2986 "page.c"
 	}
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = stream;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = pixbuf_writer_new (_tmp2_);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	writer = _tmp3_;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = page_get_image (self, TRUE);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp4_;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	icc_profile_data = NULL;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = self->priv->color_profile;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = self->priv->_color_profile;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ != NULL) {
-#line 3516 "page.c"
-		const gchar* _tmp6_;
+#line 3004 "page.c"
+		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->color_profile;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = self->priv->_color_profile;
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = page_get_icc_data_encoded (self, _tmp6_);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (icc_profile_data);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		icc_profile_data = _tmp7_;
-#line 3527 "page.c"
+#line 3015 "page.c"
 	}
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_strcmp0;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = type;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = _tmp8_ (_tmp9_, "jpeg");
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_ == 0) {
-#line 3537 "page.c"
-		gchar* _tmp11_;
-		gchar* _tmp12_;
-		gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
+#line 3025 "page.c"
+		gchar** keys = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		gchar* _tmp15_ = NULL;
 		gchar** _tmp16_ = NULL;
-		gchar** keys;
-		gint keys_length1;
-		gint _keys_size_;
-		gint _tmp17_;
+		gint keys_length1 = 0;
+		gint _keys_size_ = 0;
+		gchar** values = NULL;
+		gint _tmp17_ = 0;
 		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_;
-		gint _tmp20_;
+		gchar* _tmp19_ = NULL;
+		gint _tmp20_ = 0;
 		gchar* _tmp21_ = NULL;
-		gint _tmp22_;
+		gint _tmp22_ = 0;
 		gchar* _tmp23_ = NULL;
-		const gchar* _tmp24_;
-		gchar* _tmp25_;
+		const gchar* _tmp24_ = NULL;
+		gchar* _tmp25_ = NULL;
 		gchar** _tmp26_ = NULL;
-		gchar** values;
-		gint values_length1;
-		gint _values_size_;
-		const gchar* _tmp27_;
-		PixbufWriter* _tmp30_;
-		GdkPixbuf* _tmp31_;
-		gchar** _tmp32_;
-		gint _tmp32__length1;
-		gchar** _tmp33_;
-		gint _tmp33__length1;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		gint values_length1 = 0;
+		gint _values_size_ = 0;
+		const gchar* _tmp27_ = NULL;
+		PixbufWriter* _tmp30_ = NULL;
+		GdkPixbuf* _tmp31_ = NULL;
+		gchar** _tmp32_ = NULL;
+		gint _tmp32__length1 = 0;
+		gchar** _tmp33_ = NULL;
+		gint _tmp33__length1 = 0;
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = g_strdup ("quality");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = g_strdup ("density-unit");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp13_ = g_strdup ("x-density");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = g_strdup ("y-density");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_ = g_strdup ("icc-profile");
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = g_new0 (gchar*, 6 + 1);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_[0] = _tmp11_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_[1] = _tmp12_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_[2] = _tmp13_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_[3] = _tmp14_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_[4] = _tmp15_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_[5] = NULL;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys = _tmp16_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys_length1 = 6;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_keys_size_ = keys_length1;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp17_ = quality;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = g_strdup_printf ("%d", _tmp17_);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp19_ = g_strdup ("dots-per-inch");
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp20_ = self->priv->dpi;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp20_ = self->priv->_dpi;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = g_strdup_printf ("%d", _tmp20_);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = self->priv->dpi;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp22_ = self->priv->_dpi;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = g_strdup_printf ("%d", _tmp22_);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = icc_profile_data;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = g_strdup (_tmp24_);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_ = g_new0 (gchar*, 6 + 1);
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_[0] = _tmp18_;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_[1] = _tmp19_;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_[2] = _tmp21_;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_[3] = _tmp23_;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_[4] = _tmp25_;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_[5] = NULL;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values = _tmp26_;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values_length1 = 6;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_values_size_ = values_length1;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp27_ = icc_profile_data;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp27_ == NULL) {
-#line 3639 "page.c"
-			gchar** _tmp28_;
-			gint _tmp28__length1;
-			gchar* _tmp29_;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 3127 "page.c"
+			gchar** _tmp28_ = NULL;
+			gint _tmp28__length1 = 0;
+			gchar* _tmp29_ = NULL;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp28_ = keys;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp28__length1 = keys_length1;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_free0 (_tmp28_[4]);
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp28_[4] = NULL;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp29_ = _tmp28_[4];
-#line 3653 "page.c"
+#line 3141 "page.c"
 		}
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30_ = writer;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp31_ = image;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32_ = keys;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32__length1 = keys_length1;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp33_ = values;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp33__length1 = values_length1;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_save (_tmp30_, _tmp31_, "jpeg", _tmp32_, _tmp32__length1, _tmp33_, _tmp33__length1, &_inner_error_);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_inner_error_ != NULL) {
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			g_propagate_error (error, _inner_error_);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_free0 (icc_profile_data);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_object_unref0 (image);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_pixbuf_writer_unref0 (writer);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_object_unref0 (stream);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
-#line 3687 "page.c"
+#line 3175 "page.c"
 		}
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3693 "page.c"
+#line 3181 "page.c"
 	} else {
-		GCompareFunc _tmp34_;
-		const gchar* _tmp35_;
+		GCompareFunc _tmp34_ = NULL;
+		const gchar* _tmp35_ = NULL;
 		gint _tmp36_ = 0;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp34_ = g_strcmp0;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp35_ = type;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp36_ = _tmp34_ (_tmp35_, "png");
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp36_ == 0) {
-#line 3706 "page.c"
-			gchar* _tmp37_;
+#line 3194 "page.c"
+			gchar** keys = NULL;
+			gchar* _tmp37_ = NULL;
 			gchar** _tmp38_ = NULL;
-			gchar** keys;
-			gint keys_length1;
-			gint _keys_size_;
-			const gchar* _tmp39_;
-			gchar* _tmp40_;
+			gint keys_length1 = 0;
+			gint _keys_size_ = 0;
+			gchar** values = NULL;
+			const gchar* _tmp39_ = NULL;
+			gchar* _tmp40_ = NULL;
 			gchar** _tmp41_ = NULL;
-			gchar** values;
-			gint values_length1;
-			gint _values_size_;
-			const gchar* _tmp42_;
-			PixbufWriter* _tmp45_;
-			GdkPixbuf* _tmp46_;
-			gchar** _tmp47_;
-			gint _tmp47__length1;
-			gchar** _tmp48_;
-			gint _tmp48__length1;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			gint values_length1 = 0;
+			gint _values_size_ = 0;
+			const gchar* _tmp42_ = NULL;
+			PixbufWriter* _tmp45_ = NULL;
+			GdkPixbuf* _tmp46_ = NULL;
+			gchar** _tmp47_ = NULL;
+			gint _tmp47__length1 = 0;
+			gchar** _tmp48_ = NULL;
+			gint _tmp48__length1 = 0;
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp37_ = g_strdup ("icc-profile");
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_ = g_new0 (gchar*, 2 + 1);
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_[0] = _tmp37_;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_[1] = NULL;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = _tmp38_;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys_length1 = 2;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_keys_size_ = keys_length1;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp39_ = icc_profile_data;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp40_ = g_strdup (_tmp39_);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp41_[0] = _tmp40_;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp41_[1] = NULL;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = _tmp41_;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values_length1 = 2;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_values_size_ = values_length1;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp42_ = icc_profile_data;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp42_ == NULL) {
-#line 3759 "page.c"
-				gchar** _tmp43_;
-				gint _tmp43__length1;
-				gchar* _tmp44_;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 3247 "page.c"
+				gchar** _tmp43_ = NULL;
+				gint _tmp43__length1 = 0;
+				gchar* _tmp44_ = NULL;
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp43_ = keys;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp43__length1 = keys_length1;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_free0 (_tmp43_[0]);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp43_[0] = NULL;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp44_ = _tmp43_[0];
-#line 3773 "page.c"
+#line 3261 "page.c"
 			}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_ = writer;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp46_ = image;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp47_ = keys;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp47__length1 = keys_length1;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp48_ = values;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp48__length1 = values_length1;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			pixbuf_writer_save (_tmp45_, _tmp46_, "png", _tmp47_, _tmp47__length1, _tmp48_, _tmp48__length1, &_inner_error_);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_inner_error_ != NULL) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				g_propagate_error (error, _inner_error_);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_free0 (icc_profile_data);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_object_unref0 (image);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_pixbuf_writer_unref0 (writer);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_object_unref0 (stream);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
-#line 3807 "page.c"
+#line 3295 "page.c"
 			}
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3813 "page.c"
+#line 3301 "page.c"
 		} else {
-			GCompareFunc _tmp49_;
-			const gchar* _tmp50_;
+			GCompareFunc _tmp49_ = NULL;
+			const gchar* _tmp50_ = NULL;
 			gint _tmp51_ = 0;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49_ = g_strcmp0;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp50_ = type;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51_ = _tmp49_ (_tmp50_, "tiff");
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp51_ == 0) {
-#line 3826 "page.c"
-				gchar* _tmp52_;
-				gchar* _tmp53_;
+#line 3314 "page.c"
+				gchar** keys = NULL;
+				gchar* _tmp52_ = NULL;
+				gchar* _tmp53_ = NULL;
 				gchar** _tmp54_ = NULL;
-				gchar** keys;
-				gint keys_length1;
-				gint _keys_size_;
-				gchar* _tmp55_;
-				const gchar* _tmp56_;
-				gchar* _tmp57_;
+				gint keys_length1 = 0;
+				gint _keys_size_ = 0;
+				gchar** values = NULL;
+				gchar* _tmp55_ = NULL;
+				const gchar* _tmp56_ = NULL;
+				gchar* _tmp57_ = NULL;
 				gchar** _tmp58_ = NULL;
-				gchar** values;
-				gint values_length1;
-				gint _values_size_;
-				const gchar* _tmp59_;
-				PixbufWriter* _tmp62_;
-				GdkPixbuf* _tmp63_;
-				gchar** _tmp64_;
-				gint _tmp64__length1;
-				gchar** _tmp65_;
-				gint _tmp65__length1;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				gint values_length1 = 0;
+				gint _values_size_ = 0;
+				const gchar* _tmp59_ = NULL;
+				PixbufWriter* _tmp62_ = NULL;
+				GdkPixbuf* _tmp63_ = NULL;
+				gchar** _tmp64_ = NULL;
+				gint _tmp64__length1 = 0;
+				gchar** _tmp65_ = NULL;
+				gint _tmp65__length1 = 0;
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp52_ = g_strdup ("compression");
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp53_ = g_strdup ("icc-profile");
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp54_ = g_new0 (gchar*, 3 + 1);
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp54_[0] = _tmp52_;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp54_[1] = _tmp53_;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp54_[2] = NULL;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = _tmp54_;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys_length1 = 3;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_keys_size_ = keys_length1;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp55_ = g_strdup ("8");
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp56_ = icc_profile_data;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp57_ = g_strdup (_tmp56_);
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp58_ = g_new0 (gchar*, 3 + 1);
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp58_[0] = _tmp55_;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp58_[1] = _tmp57_;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp58_[2] = NULL;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = _tmp58_;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values_length1 = 3;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_values_size_ = values_length1;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp59_ = icc_profile_data;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp59_ == NULL) {
-#line 3889 "page.c"
-					gchar** _tmp60_;
-					gint _tmp60__length1;
-					gchar* _tmp61_;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 3377 "page.c"
+					gchar** _tmp60_ = NULL;
+					gint _tmp60__length1 = 0;
+					gchar* _tmp61_ = NULL;
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp60_ = keys;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp60__length1 = keys_length1;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_free0 (_tmp60_[1]);
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp60_[1] = NULL;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp61_ = _tmp60_[1];
-#line 3903 "page.c"
+#line 3391 "page.c"
 				}
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp62_ = writer;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp63_ = image;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp64_ = keys;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp64__length1 = keys_length1;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp65_ = values;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp65__length1 = values_length1;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				pixbuf_writer_save (_tmp62_, _tmp63_, "tiff", _tmp64_, _tmp64__length1, _tmp65_, _tmp65__length1, &_inner_error_);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_inner_error_ != NULL) {
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					g_propagate_error (error, _inner_error_);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_free0 (icc_profile_data);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_object_unref0 (image);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_pixbuf_writer_unref0 (writer);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_object_unref0 (stream);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
-#line 3937 "page.c"
+#line 3425 "page.c"
 				}
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3943 "page.c"
+#line 3431 "page.c"
 			} else {
 			}
 		}
 	}
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (icc_profile_data);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (image);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_pixbuf_writer_unref0 (writer);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (stream);
-#line 3956 "page.c"
+#line 3444 "page.c"
+}
+
+
+gint page_get_width (Page* self) {
+	gint result;
+	gboolean _tmp0_ = FALSE;
+	ScanDirection _tmp1_ = 0;
+	ScanDirection _tmp2_ = 0;
+	gboolean _tmp5_ = FALSE;
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = page_get_scan_direction (self);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = _tmp1_;
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp0_ = TRUE;
+#line 3464 "page.c"
+	} else {
+		ScanDirection _tmp3_ = 0;
+		ScanDirection _tmp4_ = 0;
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp3_ = page_get_scan_direction (self);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp4_ = _tmp3_;
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 3474 "page.c"
+	}
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = _tmp0_;
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp5_) {
+#line 3480 "page.c"
+		gint _tmp6_ = 0;
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = self->priv->_scan_width;
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		result = _tmp6_;
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		return result;
+#line 3488 "page.c"
+	} else {
+		gint _tmp7_ = 0;
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp7_ = self->priv->_scan_height;
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		result = _tmp7_;
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		return result;
+#line 3497 "page.c"
+	}
+}
+
+
+gint page_get_height (Page* self) {
+	gint result;
+	gboolean _tmp0_ = FALSE;
+	ScanDirection _tmp1_ = 0;
+	ScanDirection _tmp2_ = 0;
+	gboolean _tmp5_ = FALSE;
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = page_get_scan_direction (self);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = _tmp1_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp0_ = TRUE;
+#line 3518 "page.c"
+	} else {
+		ScanDirection _tmp3_ = 0;
+		ScanDirection _tmp4_ = 0;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp3_ = page_get_scan_direction (self);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp4_ = _tmp3_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 3528 "page.c"
+	}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = _tmp0_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp5_) {
+#line 3534 "page.c"
+		gint _tmp6_ = 0;
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp6_ = self->priv->_scan_height;
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		result = _tmp6_;
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		return result;
+#line 3542 "page.c"
+	} else {
+		gint _tmp7_ = 0;
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp7_ = self->priv->_scan_width;
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		result = _tmp7_;
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		return result;
+#line 3551 "page.c"
+	}
+}
+
+
+gboolean page_get_is_landscape (Page* self) {
+	gboolean result;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = page_get_width (self);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = _tmp0_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = page_get_height (self);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp3_ = _tmp2_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp1_ > _tmp3_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3576 "page.c"
+}
+
+
+gint page_get_dpi (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_dpi;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3591 "page.c"
+}
+
+
+static void page_set_dpi (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_dpi = _tmp0_;
+#line 3603 "page.c"
+}
+
+
+gint page_get_depth (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_depth;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3618 "page.c"
+}
+
+
+static void page_set_depth (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_depth = _tmp0_;
+#line 3630 "page.c"
+}
+
+
+const gchar* page_get_color_profile (Page* self) {
+	const gchar* result;
+	const gchar* _tmp0_ = NULL;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_color_profile;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3645 "page.c"
+}
+
+
+void page_set_color_profile (Page* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_free0 (self->priv->_color_profile);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_color_profile = _tmp1_;
+#line 3662 "page.c"
+}
+
+
+gint page_get_scan_width (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_scan_width;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3677 "page.c"
+}
+
+
+static void page_set_scan_width (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_scan_width = _tmp0_;
+#line 3689 "page.c"
+}
+
+
+gint page_get_scan_height (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_scan_height;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3704 "page.c"
+}
+
+
+static void page_set_scan_height (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_scan_height = _tmp0_;
+#line 3716 "page.c"
+}
+
+
+gint page_get_rowstride (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_rowstride;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3731 "page.c"
+}
+
+
+static void page_set_rowstride (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_rowstride = _tmp0_;
+#line 3743 "page.c"
+}
+
+
+gint page_get_n_channels (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_n_channels;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3758 "page.c"
+}
+
+
+static void page_set_n_channels (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_n_channels = _tmp0_;
+#line 3770 "page.c"
+}
+
+
+gboolean page_get_is_scanning (Page* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_is_scanning;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3785 "page.c"
+}
+
+
+static void page_set_is_scanning (Page* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_is_scanning = _tmp0_;
+#line 3797 "page.c"
+}
+
+
+gboolean page_get_has_data (Page* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_has_data;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3812 "page.c"
+}
+
+
+static void page_set_has_data (Page* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_has_data = _tmp0_;
+#line 3824 "page.c"
+}
+
+
+gint page_get_scan_line (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_scan_line;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3839 "page.c"
+}
+
+
+static void page_set_scan_line (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_scan_line = _tmp0_;
+#line 3851 "page.c"
+}
+
+
+gboolean page_get_is_color (Page* self) {
+	gboolean result;
+	gint _tmp0_ = 0;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_n_channels;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_ > 1;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3866 "page.c"
+}
+
+
+ScanDirection page_get_scan_direction (Page* self) {
+	ScanDirection result;
+	ScanDirection _tmp0_ = 0;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->scan_direction_;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 3881 "page.c"
+}
+
+
+void page_set_scan_direction (Page* self, ScanDirection value) {
+	ScanDirection _tmp0_ = 0;
+	ScanDirection _tmp1_ = 0;
+	gboolean size_has_changed = FALSE;
+	gint left_steps = 0;
+	ScanDirection _tmp2_ = 0;
+	ScanDirection _tmp3_ = 0;
+	gint _tmp4_ = 0;
+	gint _tmp6_ = 0;
+	gboolean _tmp7_ = FALSE;
+	ScanDirection _tmp35_ = 0;
+	gboolean _tmp36_ = FALSE;
+	gboolean _tmp37_ = FALSE;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->scan_direction_;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = value;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp0_ == _tmp1_) {
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		return;
+#line 3908 "page.c"
+	}
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	size_has_changed = FALSE;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = value;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp3_ = self->priv->scan_direction_;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	left_steps = (gint) (_tmp2_ - _tmp3_);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp4_ = left_steps;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp4_ < 0) {
+#line 3922 "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 3928 "page.c"
+	}
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp6_ = left_steps;
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp6_ != 2) {
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		size_has_changed = TRUE;
+#line 3936 "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 3942 "page.c"
+		gint _tmp8_ = 0;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp8_ = left_steps;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		switch (_tmp8_) {
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			case 1:
+#line 3950 "page.c"
+			{
+				gint t = 0;
+				gint _tmp9_ = 0;
+				gint _tmp10_ = 0;
+				gint _tmp11_ = 0;
+				gint _tmp12_ = 0;
+				gint _tmp13_ = 0;
+				gint _tmp14_ = 0;
+				gint _tmp15_ = 0;
+				gint _tmp16_ = 0;
+				gint _tmp17_ = 0;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp9_ = self->priv->_crop_x;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				t = _tmp9_;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp10_ = self->priv->_crop_y;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_x (self, _tmp10_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp11_ = page_get_width (self);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp12_ = _tmp11_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp13_ = t;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp14_ = self->priv->_crop_width;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_y (self, _tmp12_ - (_tmp13_ + _tmp14_));
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp15_ = self->priv->_crop_width;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				t = _tmp15_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp16_ = self->priv->_crop_height;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_width (self, _tmp16_);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp17_ = t;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_height (self, _tmp17_);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				break;
+#line 3994 "page.c"
+			}
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			case 2:
+#line 3998 "page.c"
+			{
+				gint _tmp18_ = 0;
+				gint _tmp19_ = 0;
+				gint _tmp20_ = 0;
+				gint _tmp21_ = 0;
+				gint _tmp22_ = 0;
+				gint _tmp23_ = 0;
+				gint _tmp24_ = 0;
+				gint _tmp25_ = 0;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp18_ = page_get_width (self);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp19_ = _tmp18_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp20_ = self->priv->_crop_x;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp21_ = self->priv->_crop_width;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_x (self, _tmp19_ - (_tmp20_ + _tmp21_));
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp22_ = page_get_width (self);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp23_ = _tmp22_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp24_ = self->priv->_crop_y;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp25_ = self->priv->_crop_height;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_));
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				break;
+#line 4030 "page.c"
+			}
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			case 3:
+#line 4034 "page.c"
+			{
+				gint t = 0;
+				gint _tmp26_ = 0;
+				gint _tmp27_ = 0;
+				gint _tmp28_ = 0;
+				gint _tmp29_ = 0;
+				gint _tmp30_ = 0;
+				gint _tmp31_ = 0;
+				gint _tmp32_ = 0;
+				gint _tmp33_ = 0;
+				gint _tmp34_ = 0;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp26_ = self->priv->_crop_y;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				t = _tmp26_;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp27_ = self->priv->_crop_x;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_y (self, _tmp27_);
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp28_ = page_get_height (self);
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp29_ = _tmp28_;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp30_ = t;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp31_ = self->priv->_crop_height;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_x (self, _tmp29_ - (_tmp30_ + _tmp31_));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp32_ = self->priv->_crop_width;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				t = _tmp32_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp33_ = self->priv->_crop_height;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_width (self, _tmp33_);
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp34_ = t;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				page_set_crop_height (self, _tmp34_);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				break;
+#line 4078 "page.c"
+			}
+			default:
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			break;
+#line 4083 "page.c"
+		}
+	}
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp35_ = value;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->scan_direction_ = _tmp35_;
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp36_ = size_has_changed;
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp36_) {
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_signal_emit_by_name (self, "size-changed");
+#line 4096 "page.c"
+	}
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_signal_emit_by_name (self, "scan-direction-changed");
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp37_ = self->priv->_has_crop;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	if (_tmp37_) {
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_signal_emit_by_name (self, "crop-changed");
+#line 4106 "page.c"
+	}
+}
+
+
+gboolean page_get_has_crop (Page* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_has_crop;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 4122 "page.c"
+}
+
+
+static void page_set_has_crop (Page* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_has_crop = _tmp0_;
+#line 4134 "page.c"
+}
+
+
+const gchar* page_get_crop_name (Page* self) {
+	const gchar* result;
+	const gchar* _tmp0_ = NULL;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_crop_name;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 4149 "page.c"
+}
+
+
+static void page_set_crop_name (Page* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_free0 (self->priv->_crop_name);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_crop_name = _tmp1_;
+#line 4166 "page.c"
+}
+
+
+gint page_get_crop_x (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_crop_x;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 4181 "page.c"
+}
+
+
+static void page_set_crop_x (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_crop_x = _tmp0_;
+#line 4193 "page.c"
+}
+
+
+gint page_get_crop_y (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_crop_y;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 4208 "page.c"
+}
+
+
+static void page_set_crop_y (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_crop_y = _tmp0_;
+#line 4220 "page.c"
+}
+
+
+gint page_get_crop_width (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_crop_width;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 4235 "page.c"
+}
+
+
+static void page_set_crop_width (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_crop_width = _tmp0_;
+#line 4247 "page.c"
+}
+
+
+gint page_get_crop_height (Page* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = self->priv->_crop_height;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	result = _tmp0_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return result;
+#line 4262 "page.c"
+}
+
+
+static void page_set_crop_height (Page* self, gint value) {
+	gint _tmp0_ = 0;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = value;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_crop_height = _tmp0_;
+#line 4274 "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 3963 "page.c"
+#line 4281 "page.c"
 }
 
 
@@ -3968,7 +4286,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 3972 "page.c"
+#line 4290 "page.c"
 	}
 }
 
@@ -3978,11 +4296,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 3982 "page.c"
+#line 4300 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3986 "page.c"
+#line 4304 "page.c"
 	}
 }
 
@@ -3990,37 +4308,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 3994 "page.c"
+#line 4312 "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 4001 "page.c"
+#line 4319 "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 4008 "page.c"
+#line 4326 "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 4012 "page.c"
+#line 4330 "page.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = page_ref (object);
-#line 4016 "page.c"
+#line 4334 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4020 "page.c"
+#line 4338 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4024 "page.c"
+#line 4342 "page.c"
 }
 
 
@@ -4031,25 +4349,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 4035 "page.c"
+#line 4353 "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 4041 "page.c"
+#line 4359 "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 4045 "page.c"
+#line 4363 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = page_ref (value->data[0].v_pointer);
-#line 4049 "page.c"
+#line 4367 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4053 "page.c"
+#line 4371 "page.c"
 }
 
 
@@ -4063,7 +4381,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 4067 "page.c"
+#line 4385 "page.c"
 }
 
 
@@ -4072,7 +4390,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 4076 "page.c"
+#line 4394 "page.c"
 }
 
 
@@ -4092,17 +4410,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 4096 "page.c"
+#line 4414 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4100 "page.c"
+#line 4418 "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 4106 "page.c"
+#line 4424 "page.c"
 	}
 }
 
@@ -4121,17 +4439,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 4125 "page.c"
+#line 4443 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4129 "page.c"
+#line 4447 "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 4135 "page.c"
+#line 4453 "page.c"
 	}
 }
 
@@ -4155,18 +4473,16 @@ 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 4159 "page.c"
+#line 4477 "page.c"
 }
 
 
 static void page_instance_init (Page * self) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv = PAGE_GET_PRIVATE (self);
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	self->priv->scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4170 "page.c"
+#line 4486 "page.c"
 }
 
 
@@ -4174,13 +4490,13 @@ static void page_finalize (Page* obj) {
 	Page * self;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->color_profile);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_free0 (self->priv->_color_profile);
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_g_free0 (self->priv->crop_name);
-#line 4184 "page.c"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_free0 (self->priv->_crop_name);
+#line 4500 "page.c"
 }
 
 
@@ -4205,7 +4521,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 4209 "page.c"
+#line 4525 "page.c"
 }
 
 
@@ -4218,323 +4534,323 @@ 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 4222 "page.c"
+#line 4538 "page.c"
 	}
 }
 
 
 PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PixbufWriter* self = NULL;
-	GFileOutputStream* _tmp0_;
-	GFileOutputStream* _tmp1_;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	GFileOutputStream* _tmp0_ = NULL;
+	GFileOutputStream* _tmp1_ = NULL;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (PixbufWriter*) g_type_create_instance (object_type);
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = stream;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->stream = _tmp1_;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 4245 "page.c"
+#line 4561 "page.c"
 }
 
 
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
-#line 4252 "page.c"
+#line 4568 "page.c"
 }
 
 
 static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
 	result = pixbuf_writer_write_pixbuf_data (self, buf, buf_length1, error);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4261 "page.c"
+#line 4577 "page.c"
 }
 
 
 void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type, gchar** option_keys, int option_keys_length1, gchar** option_values, int option_values_length1, GError** error) {
-	GdkPixbuf* _tmp0_;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
-	gint _tmp2__length1;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
+	GdkPixbuf* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar** _tmp2_ = NULL;
+	gint _tmp2__length1 = 0;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (image != NULL);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (type != NULL);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = image;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = type;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = option_keys;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2__length1 = option_keys_length1;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = option_values;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3__length1 = option_values_length1;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	gdk_pixbuf_save_to_callbackv (_tmp0_, _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func, self, _tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 4299 "page.c"
+#line 4615 "page.c"
 	}
 }
 
 
 static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf, int buf_length1, GError** error) {
 	gboolean result = FALSE;
-	GFileOutputStream* _tmp0_;
-	guint8* _tmp1_;
-	gint _tmp1__length1;
+	GFileOutputStream* _tmp0_ = NULL;
+	guint8* _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->stream;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = buf;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1__length1 = buf_length1;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return FALSE;
-#line 4326 "page.c"
+#line 4642 "page.c"
 	}
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4332 "page.c"
+#line 4648 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4339 "page.c"
+#line 4655 "page.c"
 }
 
 
 static void value_pixbuf_writer_free_value (GValue* value) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (value->data[0].v_pointer) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
-#line 4348 "page.c"
+#line 4664 "page.c"
 	}
 }
 
 
 static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
-#line 4358 "page.c"
+#line 4674 "page.c"
 	} else {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4362 "page.c"
+#line 4678 "page.c"
 	}
 }
 
 
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4370 "page.c"
+#line 4686 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4377 "page.c"
+#line 4693 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4384 "page.c"
+#line 4700 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4388 "page.c"
+#line 4704 "page.c"
 		}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
-#line 4392 "page.c"
+#line 4708 "page.c"
 	} else {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4396 "page.c"
+#line 4712 "page.c"
 	}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4400 "page.c"
+#line 4716 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixbufWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!object_p) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4411 "page.c"
+#line 4727 "page.c"
 	}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4417 "page.c"
+#line 4733 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4421 "page.c"
+#line 4737 "page.c"
 	} else {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4425 "page.c"
+#line 4741 "page.c"
 	}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4429 "page.c"
+#line 4745 "page.c"
 }
 
 
 GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixbufWriter* spec;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXBUF_WRITER), NULL);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4443 "page.c"
+#line 4759 "page.c"
 }
 
 
 gpointer value_get_pixbuf_writer (const GValue* value) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4452 "page.c"
+#line 4768 "page.c"
 }
 
 
 void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 	PixbufWriter* old;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4472 "page.c"
+#line 4788 "page.c"
 	} else {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4476 "page.c"
+#line 4792 "page.c"
 	}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4482 "page.c"
+#line 4798 "page.c"
 	}
 }
 
 
 void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 	PixbufWriter* old;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4501 "page.c"
+#line 4817 "page.c"
 	} else {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4505 "page.c"
+#line 4821 "page.c"
 	}
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4511 "page.c"
+#line 4827 "page.c"
 	}
 }
 
 
 static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	PIXBUF_WRITER_CLASS (klass)->finalize = pixbuf_writer_finalize;
-#line 4521 "page.c"
+#line 4837 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4528 "page.c"
+#line 4844 "page.c"
 }
 
 
 static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	PixbufWriter * self;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 4538 "page.c"
+#line 4854 "page.c"
 }
 
 
@@ -4555,24 +4871,24 @@ GType pixbuf_writer_get_type (void) {
 gpointer pixbuf_writer_ref (gpointer instance) {
 	PixbufWriter* self;
 	self = instance;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4563 "page.c"
+#line 4879 "page.c"
 }
 
 
 void pixbuf_writer_unref (gpointer instance) {
 	PixbufWriter* self;
 	self = instance;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4576 "page.c"
+#line 4892 "page.c"
 	}
 }
 
diff --git a/src/page.vala b/src/page.vala
index f27258c..34613b3 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -19,44 +19,150 @@ public enum ScanDirection
 
 public class Page
 {
+    /* Width of the page in pixels after rotation applied */
+    public int width
+    {
+        get
+        {
+            if (scan_direction == ScanDirection.TOP_TO_BOTTOM || scan_direction == ScanDirection.BOTTOM_TO_TOP)
+                return scan_width;
+            else
+                return scan_height;
+        }
+    }
+
+    /* Height of the page in pixels after rotation applied */
+    public int height
+    {
+        get
+        {
+            if (scan_direction == ScanDirection.TOP_TO_BOTTOM || scan_direction == ScanDirection.BOTTOM_TO_TOP)
+                return scan_height;
+            else
+                return scan_width;
+        }
+    }
+
+    /* true if the page is landscape (wider than the height) */
+    public bool is_landscape { get { return width > height; } }
+
     /* Resolution of page */
-    private int dpi;
+    public int dpi { get; private set; }
 
     /* Number of rows in this page or -1 if currently unknown */
     private int expected_rows;
 
     /* Bit depth */
-    private int depth;
+    public int depth { get; private set; }
 
     /* Color profile */
-    private string? color_profile;
+    public string? color_profile { get; set; }
+
+    /* Width of raw scan data in pixels */
+    public int scan_width { get; private set; }
 
-    /* Scanned image data */
-    private int width;
-    private int n_rows;
-    private int rowstride;
-    private int n_channels;
+    /* Height of raw scan data in pixels */
+    public int scan_height { get; private set; }
+
+    /* Offset between rows in scan data */
+    public int rowstride { get; private set; }
+
+    /* Number of color channels */
+    public int n_channels { get; private set; }
+
+    /* Pixel data */
     private uchar[] pixels;
 
     /* Page is getting data */
-    private bool scanning;
+    public bool is_scanning { get; private set; }
 
     /* true if have some page data */
-    private bool has_data_;
+    public bool has_data { get; private set; }
 
     /* Expected next scan row */
-    private int scan_line;
+    public int scan_line { get; private set; }
+
+    /* true if scan contains color information */
+    public bool is_color { get { return n_channels > 1; } }
 
     /* Rotation of scanned data */
-    private ScanDirection scan_direction = ScanDirection.TOP_TO_BOTTOM;
+    private ScanDirection scan_direction_;
+    public ScanDirection scan_direction
+    {
+        get { return scan_direction_; }
+        
+        set
+        {
+            if (scan_direction_ == value)
+                return;
+
+            /* Work out how many times it has been rotated to the left */
+            var size_has_changed = false;
+            var left_steps = (int) (value - scan_direction_);
+            if (left_steps < 0)
+                left_steps += 4;
+            if (left_steps != 2)
+                size_has_changed = true;
+
+            /* Rotate crop */
+            if (has_crop)
+            {
+                switch (left_steps)
+                {
+                /* 90 degrees counter-clockwise */
+                case 1:
+                    var t = crop_x;
+                    crop_x = crop_y;
+                    crop_y = width - (t + crop_width);
+                    t = crop_width;
+                    crop_width = crop_height;
+                    crop_height = t;
+                    break;
+                /* 180 degrees */
+                case 2:
+                    crop_x = width - (crop_x + crop_width);
+                    crop_y = width - (crop_y + crop_height);
+                    break;
+                /* 90 degrees clockwise */
+                case 3:
+                    var t = crop_y;
+                    crop_y = crop_x;
+                    crop_x = height - (t + crop_height);
+                    t = crop_width;
+                    crop_width = crop_height;
+                    crop_height = t;
+                    break;
+                }
+            }
+
+            scan_direction_ = value;
+            if (size_has_changed)
+                size_changed ();
+            scan_direction_changed ();
+            if (has_crop)
+                crop_changed ();
+        }
+        
+        default = ScanDirection.TOP_TO_BOTTOM;
+    }
+
+    /* True if the page has a crop set */
+    public bool has_crop { get; private set; }
 
-    /* Crop */
-    private bool has_crop_;
-    private string? crop_name;
-    private int crop_x;
-    private int crop_y;
-    private int crop_width;
-    private int crop_height;
+    /* Name of the crop if using a named crop */
+    public string? crop_name { get; private set; }
+
+    /* X co-ordinate of top left crop corner */
+    public int crop_x { get; private set; }
+
+    /* Y co-ordinate of top left crop corner */
+    public int crop_y { get; private set; }
+
+    /* Width of crop in pixels */
+    public int crop_width { get; private set; }
+
+    /* Height of crop in pixels*/
+    public int crop_height { get; private set; }
 
     public signal void pixels_changed ();
     public signal void size_changed ();
@@ -69,40 +175,75 @@ public class Page
     {
         if (scan_direction == ScanDirection.TOP_TO_BOTTOM || scan_direction == ScanDirection.BOTTOM_TO_TOP)
         {
-            this.width = width;
-            n_rows = height;
+            scan_width = width;
+            scan_height = height;
         }
         else
         {
-            this.width = height;
-            n_rows = width;
+            scan_width = height;
+            scan_height = width;
         }
         this.dpi = dpi;
         this.scan_direction = scan_direction;
     }
 
+    public Page.from_data (int scan_width,
+                           int scan_height,
+                           int rowstride,
+                           int n_channels,
+                           int depth,
+                           int dpi,
+                           ScanDirection scan_direction,
+                           string? color_profile,
+                           uchar[]? pixels,
+                           bool has_crop,
+                           string? crop_name,
+                           int crop_x,
+                           int crop_y,
+                           int crop_width,
+                           int crop_height)
+    {
+        this.scan_width = scan_width;
+        this.scan_height = scan_height;
+        this.expected_rows = scan_height;
+        this.rowstride = rowstride;
+        this.n_channels = n_channels;
+        this.depth = depth;
+        this.dpi = dpi;
+        this.scan_direction = scan_direction;
+        this.color_profile = color_profile;
+        this.pixels = pixels;
+        has_data = pixels != null;
+        this.has_crop = has_crop;
+        this.crop_name = crop_name;
+        this.crop_x = crop_x;
+        this.crop_y = crop_y;
+        this.crop_width = crop_width;
+        this.crop_height = crop_height;
+    }
+
     public void set_page_info (ScanPageInfo info)
     {
         expected_rows = info.height;
         dpi = (int) info.dpi;
 
         /* Create a white page */
-        width = info.width;
-        n_rows = info.height;
+        scan_width = info.width;
+        scan_height = info.height;
         /* Variable height, try 50% of the width for now */
-        if (n_rows < 0)
-            n_rows = width / 2;
+        if (scan_height < 0)
+            scan_height = scan_width / 2;
         depth = info.depth;
         n_channels = info.n_channels;
-        rowstride = (width * depth * n_channels + 7) / 8;
-        pixels.resize (n_rows * rowstride);
+        rowstride = (scan_width * depth * n_channels + 7) / 8;
+        pixels.resize (scan_height * rowstride);
         return_if_fail (pixels != null);
 
         /* Fill with white */
         if (depth == 1)
-            Memory.set (pixels, 0x00, n_rows * rowstride);
+            Memory.set (pixels, 0x00, scan_height * rowstride);
         else
-            Memory.set (pixels, 0xFF, n_rows * rowstride);
+            Memory.set (pixels, 0xFF, scan_height * rowstride);
 
         size_changed ();
         pixels_changed ();
@@ -110,47 +251,23 @@ public class Page
 
     public void start ()
     {
-        scanning = true;
+        is_scanning = true;
         scan_line_changed ();
     }
 
-    public bool is_scanning ()
-    {
-        return scanning;
-    }
-
-    public bool has_data ()
-    {
-        return has_data_;
-    }
-
-    public bool is_color ()
-    {
-        return n_channels > 1;
-    }
-
-    public int get_scan_line ()
-    {
-        return scan_line;
-    }
-
     private void parse_line (ScanLine line, int n, out bool size_changed)
     {
-        int line_number;
-
-        line_number = line.number + n;
+        var line_number = line.number + n;
 
         /* Extend image if necessary */
         size_changed = false;
-        while (line_number >= get_scan_height ())
+        while (line_number >= scan_height)
         {
-            int rows;
-
             /* Extend image */
-            rows = n_rows;
-            n_rows = rows + width / 2;
-            debug ("Extending image from %d lines to %d lines", rows, n_rows);
-            pixels.resize (n_rows * rowstride);
+            var rows = scan_height;
+            scan_height = rows + scan_width / 2;
+            debug ("Extending image from %d lines to %d lines", rows, scan_height);
+            pixels.resize (scan_height * rowstride);
 
             size_changed = true;
         }
@@ -170,7 +287,7 @@ public class Page
         for (var i = 0; i < line.n_lines; i++)
             parse_line (line, i, out size_has_changed);
 
-        has_data_ = true;
+        has_data = true;
 
         if (size_has_changed)
             size_changed ();
@@ -184,18 +301,16 @@ public class Page
 
         /* Trim page */
         if (expected_rows < 0 &&
-            scan_line != get_scan_height ())
+            scan_line != scan_height)
         {
-            int rows;
-
-            rows = n_rows;
-            n_rows = scan_line;
-            pixels.resize (n_rows * rowstride);
-            debug ("Trimming page from %d lines to %d lines", rows, n_rows);
+            var rows = scan_height;
+            scan_height = scan_line;
+            pixels.resize (scan_height * rowstride);
+            debug ("Trimming page from %d lines to %d lines", rows, scan_height);
 
             size_has_changed = true;
         }
-        scanning = false;
+        is_scanning = false;
 
         if (size_has_changed)
             size_changed ();
@@ -203,197 +318,72 @@ public class Page
         scan_finished ();
     }
 
-    public ScanDirection get_scan_direction ()
-    {
-        return scan_direction;
-    }
-
-    private void set_scan_direction (ScanDirection direction)
-    {
-        int left_steps, t;
-        bool size_has_changed = false;
-        int width, height;
-
-        if (scan_direction == direction)
-            return;
-
-        /* Work out how many times it has been rotated to the left */
-        left_steps = direction - scan_direction;
-        if (left_steps < 0)
-            left_steps += 4;
-        if (left_steps != 2)
-            size_has_changed = true;
-
-        width = get_width ();
-        height = get_height ();
-
-        /* Rotate crop */
-        if (has_crop_)
-        {
-            switch (left_steps)
-            {
-            /* 90 degrees counter-clockwise */
-            case 1:
-                t = crop_x;
-                crop_x = crop_y;
-                crop_y = width - (t + crop_width);
-                t = crop_width;
-                crop_width = crop_height;
-                crop_height = t;
-                break;
-            /* 180 degrees */
-            case 2:
-                crop_x = width - (crop_x + crop_width);
-                crop_y = width - (crop_y + crop_height);
-                break;
-            /* 90 degrees clockwise */
-            case 3:
-                t = crop_y;
-                crop_y = crop_x;
-                crop_x = height - (t + crop_height);
-                t = crop_width;
-                crop_width = crop_height;
-                crop_height = t;
-                break;
-            }
-        }
-
-        scan_direction = direction;
-        if (size_has_changed)
-            size_changed ();
-        scan_direction_changed ();
-        if (has_crop_)
-            crop_changed ();
-    }
-
     public void rotate_left ()
     {
-        var direction = scan_direction;
-        switch (direction)
+        switch (scan_direction)
         {
         case ScanDirection.TOP_TO_BOTTOM:
-            direction = ScanDirection.LEFT_TO_RIGHT;
+            scan_direction = ScanDirection.LEFT_TO_RIGHT;
             break;
         case ScanDirection.LEFT_TO_RIGHT:
-            direction = ScanDirection.BOTTOM_TO_TOP;
+            scan_direction = ScanDirection.BOTTOM_TO_TOP;
             break;
         case ScanDirection.BOTTOM_TO_TOP:
-            direction = ScanDirection.RIGHT_TO_LEFT;
+            scan_direction = ScanDirection.RIGHT_TO_LEFT;
             break;
         case ScanDirection.RIGHT_TO_LEFT:
-            direction = ScanDirection.TOP_TO_BOTTOM;
+            scan_direction = ScanDirection.TOP_TO_BOTTOM;
             break;
         }
-        set_scan_direction (direction);
     }
 
     public void rotate_right ()
     {
-        var direction = scan_direction;
-        switch (direction)
+        switch (scan_direction)
         {
         case ScanDirection.TOP_TO_BOTTOM:
-            direction = ScanDirection.RIGHT_TO_LEFT;
+            scan_direction = ScanDirection.RIGHT_TO_LEFT;
             break;
         case ScanDirection.LEFT_TO_RIGHT:
-            direction = ScanDirection.TOP_TO_BOTTOM;
+            scan_direction = ScanDirection.TOP_TO_BOTTOM;
             break;
         case ScanDirection.BOTTOM_TO_TOP:
-            direction = ScanDirection.LEFT_TO_RIGHT;
+            scan_direction = ScanDirection.LEFT_TO_RIGHT;
             break;
         case ScanDirection.RIGHT_TO_LEFT:
-            direction = ScanDirection.BOTTOM_TO_TOP;
+            scan_direction = ScanDirection.BOTTOM_TO_TOP;
             break;
         }
-        set_scan_direction (direction);
-    }
-
-    public int get_dpi ()
-    {
-        return dpi;
-    }
-
-    public bool is_landscape ()
-    {
-       return get_width () > get_height ();
-    }
-
-    public int get_width ()
-    {
-        if (scan_direction == ScanDirection.TOP_TO_BOTTOM || scan_direction == ScanDirection.BOTTOM_TO_TOP)
-            return width;
-        else
-            return n_rows;
-    }
-
-    public int get_height ()
-    {
-        if (scan_direction == ScanDirection.TOP_TO_BOTTOM || scan_direction == ScanDirection.BOTTOM_TO_TOP)
-            return n_rows;
-        else
-            return width;
-    }
-
-    public int get_depth ()
-    {
-        return depth;
-    }
-
-    public int get_n_channels ()
-    {
-        return n_channels;
-    }
-
-    public int get_rowstride ()
-    {
-        return rowstride;
-    }
-
-    public int get_scan_width ()
-    {
-        return width;
-    }
-
-    public int get_scan_height ()
-    {
-        return n_rows;
-    }
-
-    public void set_color_profile (string? color_profile)
-    {
-         this.color_profile = color_profile;
-    }
-
-    public string get_color_profile ()
-    {
-         return color_profile;
     }
 
     public void set_no_crop ()
     {
-        if (!has_crop_)
+        if (!has_crop)
             return;
-        has_crop_ = false;
+        has_crop = false;
+        crop_name = null;
+        crop_x = 0;
+        crop_y = 0;
+        crop_width = 0;
+        crop_height = 0;
         crop_changed ();
     }
 
     public void set_custom_crop (int width, int height)
     {
-        //int pw, ph;
-
         return_if_fail (width >= 1);
         return_if_fail (height >= 1);
-
-        if (crop_name == null && has_crop_ && crop_width == width && crop_height == height)
+        
+        if (crop_name == null && has_crop && crop_width == width && crop_height == height)
             return;
         crop_name = null;
-        has_crop_ = true;
+        has_crop = true;
 
         crop_width = width;
         crop_height = height;
 
-        /*pw = get_width ();
-        ph = get_height ();
+        /*var pw = width;
+        var ph = height;
         if (crop_width < pw)
             crop_x = (pw - crop_width) / 2;
         else
@@ -408,32 +398,32 @@ public class Page
 
     public void set_named_crop (string name)
     {
-        double width, height;
+        double w, h;
         switch (name)
         {
         case "A4":
-            width = 8.3;
-            height = 11.7;
+            w = 8.3;
+            h = 11.7;
             break;
         case "A5":
-            width = 5.8;
-            height = 8.3;
+            w = 5.8;
+            h = 8.3;
             break;
         case "A6":
-            width = 4.1;
-            height = 5.8;
+            w = 4.1;
+            h = 5.8;
             break;
         case "letter":
-            width = 8.5;
-            height = 11;
+            w = 8.5;
+            h = 11;
             break;
         case "legal":
-            width = 8.5;
-            height = 14;
+            w = 8.5;
+            h = 14;
             break;
         case "4x6":
-            width = 4;
-            height = 6;
+            w = 4;
+            h = 6;
             break;
         default:
             warning ("Unknown paper size '%s'", name);
@@ -441,23 +431,22 @@ public class Page
         }
 
         crop_name = name;
-        has_crop_ = true;
+        has_crop = true;
 
-        var pw = get_width ();
-        var ph = get_height ();
+        var pw = width;
+        var ph = height;
 
         /* Rotate to match original aspect */
         if (pw > ph)
         {
-            double t;
-            t = width;
-            width = height;
-            height = t;
+            var t = w;
+            w = h;
+            h = t;
         }
 
         /* Custom crop, make slightly smaller than original */
-        crop_width = (int) (width * dpi + 0.5);
-        crop_height = (int) (height * dpi + 0.5);
+        crop_width = (int) (w * dpi + 0.5);
+        crop_height = (int) (h * dpi + 0.5);
 
         if (crop_width < pw)
             crop_x = (pw - crop_width) / 2;
@@ -474,8 +463,8 @@ public class Page
     {
         return_if_fail (x >= 0);
         return_if_fail (y >= 0);
-        return_if_fail (x < get_width ());
-        return_if_fail (y < get_height ());
+        return_if_fail (x < width);
+        return_if_fail (y < height);
 
         crop_x = x;
         crop_y = y;
@@ -484,22 +473,18 @@ public class Page
 
     public void rotate_crop ()
     {
-        int t;
-
-        if (!has_crop_)
+        if (!has_crop)
             return;
 
-        t = crop_width;
+        var t = crop_width;
         crop_width = crop_height;
         crop_height = t;
 
         /* Clip custom crops */
         if (crop_name == null)
         {
-            int w, h;
-
-            w = get_width ();
-            h = get_height ();
+            var w = width;
+            var h = height;
 
             if (crop_x + crop_width > w)
                 crop_x = w - crop_width;
@@ -520,36 +505,11 @@ public class Page
         crop_changed ();
     }
 
-    public bool has_crop ()
-    {
-        return has_crop_;
-    }
-
-    public void get_crop (out int x, out int y, out int width, out int height)
-    {
-        x = crop_x;
-        y = crop_y;
-        width = crop_width;
-        height = crop_height;
-    }
-
-    public string get_named_crop ()
-    {
-        return crop_name;
-    }
-
     public unowned uchar[] get_pixels ()
     {
         return pixels;
     }
 
-    public void set_pixels (uchar[] new_pixels)
-    {
-        pixels = new_pixels;
-        has_data_ = new_pixels != null;
-        pixels_changed ();
-    }
-
     // FIXME: Copied from page-view, should be shared code
     private uchar get_sample (uchar[] pixels, int offset, int x, int depth, int n_channels, int channel)
     {
@@ -560,29 +520,27 @@ public class Page
     // FIXME: Copied from page-view, should be shared code
     private void get_pixel (int x, int y, uchar[] pixel, int offset)
     {
-        switch (get_scan_direction ())
+        switch (scan_direction)
         {
         case ScanDirection.TOP_TO_BOTTOM:
             break;
         case ScanDirection.BOTTOM_TO_TOP:
-            x = get_scan_width () - x - 1;
-            y = get_scan_height () - y - 1;
+            x = scan_width - x - 1;
+            y = scan_height - y - 1;
             break;
         case ScanDirection.LEFT_TO_RIGHT:
             var t = x;
-            x = get_scan_width () - y - 1;
+            x = scan_width - y - 1;
             y = t;
             break;
         case ScanDirection.RIGHT_TO_LEFT:
             var t = x;
             x = y;
-            y = get_scan_height () - t - 1;
+            y = scan_height - t - 1;
             break;
         }
 
-        var depth = get_depth ();
-        var n_channels = get_n_channels ();
-        var line_offset = get_rowstride () * y;
+        var line_offset = rowstride * y;
 
         /* Optimise for 8 bit images */
         if (depth == 8 && n_channels == 3)
@@ -630,7 +588,7 @@ public class Page
     public Gdk.Pixbuf get_image (bool apply_crop)
     {
         int l, r, t, b;
-        if (apply_crop && has_crop_)
+        if (apply_crop && has_crop)
         {
             l = crop_x;
             r = l + crop_width;
@@ -639,19 +597,19 @@ public class Page
 
             if (l < 0)
                 l = 0;
-            if (r > get_width ())
-                r = get_width ();
+            if (r > width)
+                r = width;
             if (t < 0)
                 t = 0;
-            if (b > get_height ())
-                b = get_height ();
+            if (b > height)
+                b = height;
         }
         else
         {
             l = 0;
-            r = get_width ();
+            r = width;
             t = 0;
-            b = get_height ();
+            b = height;
         }
 
         var image = new Gdk.Pixbuf (Gdk.Colorspace.RGB, false, 8, r - l, b - t);
diff --git a/src/resources.c b/src/resources.c
index 9354d37..ba2e1c5 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -6,328 +6,637 @@
 # define SECTION
 #endif
 
-static const SECTION union { const guint8 data[38553]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
+static const SECTION union { const guint8 data[45120]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
   0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, 
+  0x18, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x28, 0x06, 0x00, 0x00, 0x00, 
   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-  0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
-  0x05, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
-  0xff, 0xff, 0xff, 0xff, 0xac, 0x00, 0x00, 0x00, 
-  0x01, 0x00, 0x4c, 0x00, 0xb0, 0x00, 0x00, 0x00, 
-  0xb4, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
-  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 
-  0x04, 0x00, 0x4c, 0x00, 0xb8, 0x00, 0x00, 0x00, 
-  0xbc, 0x00, 0x00, 0x00, 0x6e, 0xa3, 0x22, 0x37, 
-  0x03, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 
-  0x0b, 0x00, 0x4c, 0x00, 0xc8, 0x00, 0x00, 0x00, 
-  0xcc, 0x00, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
-  0x01, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 
-  0x06, 0x00, 0x4c, 0x00, 0xd4, 0x00, 0x00, 0x00, 
-  0xd8, 0x00, 0x00, 0x00, 0x76, 0x8d, 0xc8, 0xbd, 
-  0x02, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 
-  0x0e, 0x00, 0x76, 0x00, 0xe8, 0x00, 0x00, 0x00, 
-  0x99, 0x96, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
-  0x01, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 
-  0x03, 0x00, 0x00, 0x00, 0x53, 0x69, 0x6d, 0x70, 
-  0x6c, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x2f, 0x00, 
-  0x04, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, 
-  0x65, 0x2f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+  0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+  0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+  0xb8, 0x8c, 0x08, 0x40, 0x04, 0x00, 0x00, 0x00, 
+  0xc8, 0x00, 0x00, 0x00, 0x13, 0x00, 0x76, 0x00, 
+  0xe0, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 
+  0x76, 0x8d, 0xc8, 0xbd, 0x04, 0x00, 0x00, 0x00, 
+  0xe0, 0x07, 0x00, 0x00, 0x0e, 0x00, 0x76, 0x00, 
+  0xf0, 0x07, 0x00, 0x00, 0x0f, 0xb0, 0x00, 0x00, 
+  0x4b, 0x50, 0x90, 0x0b, 0x05, 0x00, 0x00, 0x00, 
+  0x0f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, 
+  0x14, 0xb0, 0x00, 0x00, 0x18, 0xb0, 0x00, 0x00, 
+  0xb0, 0xb7, 0x24, 0x30, 0x02, 0x00, 0x00, 0x00, 
+  0x18, 0xb0, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, 
+  0x20, 0xb0, 0x00, 0x00, 0x24, 0xb0, 0x00, 0x00, 
+  0x6e, 0xa3, 0x22, 0x37, 0x03, 0x00, 0x00, 0x00, 
+  0x24, 0xb0, 0x00, 0x00, 0x0b, 0x00, 0x4c, 0x00, 
+  0x30, 0xb0, 0x00, 0x00, 0x38, 0xb0, 0x00, 0x00, 
+  0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 
+  0x38, 0xb0, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, 
+  0x3c, 0xb0, 0x00, 0x00, 0x40, 0xb0, 0x00, 0x00, 
   0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2d, 0x73, 
-  0x63, 0x61, 0x6e, 0x2e, 0x75, 0x69, 0x00, 0x00, 
-  0xa1, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x63, 0x61, 0x6e, 0x2d, 0x6d, 0x65, 0x6e, 0x75, 
+  0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0xf0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
   0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
   0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, 
   0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 
-  0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 
-  0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, 0x22, 
-  0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, 0x65, 
-  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x32, 
-  0x2e, 0x31, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 
-  0x2d, 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
-  0x66, 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 
-  0x69, 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 
-  0x63, 0x79, 0x20, 0x70, 0x72, 0x6f, 0x6a, 0x65, 
-  0x63, 0x74, 0x2d, 0x77, 0x69, 0x64, 0x65, 0x20, 
-  0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x57, 0x69, 0x6e, 
-  0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 
-  0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 
-  0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, 
+  0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, 
+  0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 
+  0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, 
+  0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 
+  0x70, 0x70, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x4e, 0x65, 0x77, 0x20, 0x44, 0x6f, 
+  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
+  0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x6e, 
+  0x65, 0x77, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 
+  0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x21, 0x5b, 0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 
+  0x3c, 0x43, 0x74, 0x72, 0x6c, 0x3e, 0x4e, 0x5d, 
+  0x5d, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 
+  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 
+  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 
+  0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 
+  0x3c, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 
+  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x3e, 0x44, 0x6f, 0x63, 0x75, 
+  0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 
+  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 
+  0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x53, 0x61, 0x76, 0x65, 0x3c, 0x2f, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
+  0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x73, 
+  0x61, 0x76, 0x65, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x21, 0x5b, 0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 
+  0x3c, 0x43, 0x74, 0x72, 0x6c, 0x3e, 0x53, 0x5d, 
+  0x5d, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 
+  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 
+  0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x61, 
+  0x76, 0x65, 0x20, 0x41, 0x73, 0x2e, 0x2e, 0x2e, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 
+  0x2e, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x61, 0x73, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 0x43, 
+  0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x53, 0x68, 
+  0x69, 0x66, 0x74, 0x3e, 0x3c, 0x43, 0x74, 0x72, 
+  0x6c, 0x3e, 0x53, 0x5d, 0x5d, 0x3e, 0x3c, 0x2f, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 
+  0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x2e, 
+  0x2e, 0x2e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 
+  0x70, 0x70, 0x2e, 0x65, 0x6d, 0x61, 0x69, 0x6c, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 0x43, 
+  0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x43, 0x74, 
+  0x72, 0x6c, 0x3e, 0x45, 0x5d, 0x5d, 0x3e, 0x3c, 
+  0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
+  0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 
+  0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 
+  0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
+  0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x50, 0x72, 0x69, 0x6e, 0x74, 
+  0x2e, 0x2e, 0x2e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x61, 0x70, 0x70, 0x2e, 0x70, 0x72, 0x69, 0x6e, 
+  0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 
+  0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 
+  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 
+  0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x43, 
+  0x74, 0x72, 0x6c, 0x3e, 0x50, 0x5d, 0x5d, 0x3e, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 
+  0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x2f, 0x73, 
+  0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 
+  0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 
+  0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
+  0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x50, 0x72, 0x65, 0x66, 0x65, 
+  0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
+  0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x70, 
+  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
+  0x65, 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 
+  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 
+  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 
+  0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 
+  0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x3e, 0x48, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x68, 0x65, 
+  0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
+  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 
+  0x5b, 0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 0x46, 
+  0x31, 0x5d, 0x5d, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 
+  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 
+  0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
+  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 
+  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 
+  0x41, 0x62, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x61, 
+  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
+  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x61, 0x62, 
+  0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
+  0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 
+  0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
   0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x6f, 
-  0x66, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x77, 
-  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x53, 
-  0x69, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x53, 0x63, 
-  0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x51, 
+  0x75, 0x69, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
+  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
+  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x61, 0x70, 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 
+  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
+  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
+  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 0x43, 
+  0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x43, 0x74, 
+  0x72, 0x6c, 0x3e, 0x51, 0x5d, 0x5d, 0x3e, 0x3c, 
+  0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
+  0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 
+  0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 
+  0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 
+  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 
+  0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2d, 0x73, 
+  0x63, 0x61, 0x6e, 0x2e, 0x75, 0x69, 0x00, 0x00, 
+  0x0f, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
+  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
+  0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 
+  0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, 
+  0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 
+  0x21, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 
+  0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 
+  0x74, 0x68, 0x20, 0x67, 0x6c, 0x61, 0x64, 0x65, 
+  0x20, 0x33, 0x2e, 0x31, 0x36, 0x2e, 0x30, 0x20, 
+  0x6f, 0x6e, 0x20, 0x54, 0x75, 0x65, 0x20, 0x4e, 
+  0x6f, 0x76, 0x20, 0x31, 0x39, 0x20, 0x31, 0x33, 
+  0x3a, 0x35, 0x30, 0x3a, 0x33, 0x35, 0x20, 0x32, 
+  0x30, 0x31, 0x33, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 
+  0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 
+  0x63, 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
+  0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 
+  0x65, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 
+  0x65, 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 
+  0x33, 0x2e, 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 
+  0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x5f, 0x64, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 
+  0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
+  0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
-  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
-  0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 
+  0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 
+  0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 
+  0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 
-  0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 
-  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 
-  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 0x6f, 0x6e, 
-  0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x5f, 0x65, 
-  0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 
-  0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x77, 
-  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x64, 0x65, 
-  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 
-  0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
-  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 
-  0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 
-  0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 
-  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x77, 0x69, 
-  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 
-  0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x76, 0x62, 
-  0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x72, 0x67, 0x65, 0x6e, 0x63, 
+  0x79, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x69, 0x65, 0x6e, 0x74, 
+  0x5f, 0x66, 0x6f, 0x72, 0x22, 0x3e, 0x73, 0x69, 
+  0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 
+  0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 
+  0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 
+  0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 
+  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 
+  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 
+  0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 
+  0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 
+  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 
+  0x61, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
   0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
-  0x75, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 
-  0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 
+  0x79, 0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 
+  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x42, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 
+  0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x20, 0x61, 
+  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 
+  0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x69, 0x61, 
+  0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x5f, 0x41, 0x75, 
+  0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 
+  0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 
+  0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 
-  0x6e, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 
-  0x28, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 
-  0x73, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 
-  0x69, 0x73, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 
-  0x65, 0x6e, 0x74, 0x2c, 0x20, 0x65, 0x2e, 0x67, 
-  0x2e, 0x20, 0x73, 0x61, 0x76, 0x65, 0x2c, 0x20, 
-  0x70, 0x72, 0x69, 0x6e, 0x74, 0x29, 0x22, 0x3e, 
-  0x5f, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
-  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 
-  0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 
-  0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 
+  0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 
-  0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 
-  0x65, 0x77, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
-  0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 
+  0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
-  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
-  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
-  0x6e, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
-  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
-  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
-  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
-  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
-  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 0x6e, 
-  0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 
-  0x65, 0x6d, 0x22, 0x3e, 0x53, 0x63, 0x5f, 0x61, 
-  0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 
+  0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
+  0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, 0x6f, 
+  0x72, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
   0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
-  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 
-  0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 
-  0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
-  0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
-  0x63, 0x61, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x73, 0x69, 
-  0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 0x6e, 0x20, 
-  0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
-  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 
-  0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
-  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 
-  0x22, 0x3e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
-  0x20, 0x5f, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x54, 0x68, 0x69, 0x73, 0x20, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 
+  0x74, 0x20, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 
+  0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x61, 0x6e, 
+  0x64, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x65, 0x64, 0x22, 0x3e, 0x54, 0x6f, 0x20, 
+  0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 
+  0x74, 0x6f, 0x20, 0x3f, 0x20, 0x79, 0x6f, 0x75, 
+  0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, 0x74, 0x6f, 
+  0x20, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 
+  0x7a, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 
+  0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 
+  0x69, 0x64, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 
+  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 
+  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
+  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 
+  0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
+  0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 
+  0x72, 0x22, 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x31, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
-  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
-  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
-  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
-  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x63, 0x61, 
-  0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 
-  0x61, 0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 
+  0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 
+  0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -335,63 +644,132 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 
-  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 
-  0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 0x66, 0x72, 
-  0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 0x6f, 0x63, 
-  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x65, 
-  0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x41, 0x6c, 
-  0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 0x73, 0x20, 
-  0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 0x46, 0x65, 
-  0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 0x3e, 0xe2, 
+  0x97, 0x8f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
+  0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
-  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x66, 
-  0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 
-  0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 
-  0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 
-  0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x69, 
-  0x6e, 0x75, 0x6f, 0x75, 0x73, 0x5f, 0x73, 0x63, 
-  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
-  0x74, 0x6f, 0x70, 0x5f, 0x73, 0x63, 0x61, 0x6e, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x3e, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 
+  0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
+  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
+  0x22, 0x3e, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 
+  0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 
+  0x6f, 0x72, 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
   0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 
-  0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
   0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
@@ -400,157 +778,605 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
   0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
   0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x65, 
-  0x6e, 0x74, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 
-  0x73, 0x74, 0x6f, 0x70, 0x20, 0x63, 0x75, 0x72, 
-  0x72, 0x65, 0x6e, 0x74, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x22, 0x3e, 0x5f, 0x53, 0x74, 0x6f, 0x70, 
-  0x20, 0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
-  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
-  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
-  0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x22, 0x20, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 
-  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
-  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 
-  0x72, 0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 
-  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x32, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 
-  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x70, 
+  0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x20, 
+  0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x5f, 
+  0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 
+  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
   0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
+  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 
+  0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 
+  0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 
-  0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 
-  0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 
-  0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
-  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
-  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
-  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
+  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
+  0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
+  0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 
+  0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 
+  0x30, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x68, 0x6f, 
+  0x72, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 
+  0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 
+  0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
+  0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, 
+  0x77, 0x65, 0x72, 0x22, 0x3e, 0x2d, 0x31, 0x30, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 
+  0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 
+  0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 
+  0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 
+  0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 
+  0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 0x61, 0x64, 
+  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x22, 
+  0x3e, 0x2d, 0x31, 0x30, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x70, 0x70, 0x65, 0x72, 0x22, 0x3e, 0x31, 
+  0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, 
+  0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 
+  0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 
+  0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
+  0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 
+  0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 
+  0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
+  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
+  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 
+  0x61, 0x6d, 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 
+  0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 
+  0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 
+  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 
+  0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 
+  0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 
-  0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
+  0x22, 0x3e, 0x6d, 0x61, 0x69, 0x6c, 0x2d, 0x73, 
+  0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 
+  0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
+  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x68, 0x65, 
+  0x6c, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
+  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 
+  0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 
+  0x65, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 
+  0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 
+  0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6d, 0x6f, 0x64, 
+  0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
+  0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 
+  0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
+  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
+  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
+  0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 0x6f, 
+  0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x74, 0x65, 
+  0x78, 0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
+  0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x65, 0x78, 
+  0x74, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 
+  0x6f, 0x64, 0x65, 0x22, 0x3e, 0x54, 0x65, 0x78, 
+  0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
+  0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 
+  0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x70, 0x68, 
+  0x6f, 0x74, 0x6f, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
+  0x62, 0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x68, 
+  0x6f, 0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x20, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x50, 
+  0x68, 0x6f, 0x74, 0x6f, 0x3c, 0x2f, 0x63, 0x6f, 
+  0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 
+  0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 
-  0x76, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 
+  0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 
+  0x64, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
+  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
+  0x61, 0x6d, 0x65, 0x20, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 
+  0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
+  0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 
+  0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x33, 
+  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 
+  0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 
+  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 
+  0x69, 0x6e, 0x67, 0x20, 0x62, 0x6f, 0x74, 0x68, 
+  0x20, 0x73, 0x69, 0x64, 0x65, 0x73, 0x20, 0x6f, 
+  0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x22, 0x3e, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x20, 
+  0x61, 0x6e, 0x64, 0x20, 0x42, 0x61, 0x63, 0x6b, 
+  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 
+  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x30, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 0x6f, 0x6d, 
+  0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x20, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 
+  0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x72, 
+  0x6f, 0x6e, 0x74, 0x20, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x22, 0x3e, 0x46, 0x72, 0x6f, 0x6e, 
+  0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
+  0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 
+  0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x32, 0x3c, 
+  0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x20, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 
+  0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 
+  0x61, 0x63, 0x6b, 0x20, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x22, 0x3e, 0x42, 0x61, 0x63, 0x6b, 
+  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 
+  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 
+  0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 
+  0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x70, 
+  0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
+  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
+  0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
+  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 
+  0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 
+  0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 
+  0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 
+  0x69, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x64, 0x70, 0x69, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 
+  0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 
+  0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 
+  0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
+  0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 
+  0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
-  0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 
+  0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 
+  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
+  0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x70, 
+  0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 
+  0x6e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x69, 0x6d, 
+  0x70, 0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 
+  0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x54, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x6f, 0x66, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x77, 0x69, 
+  0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x53, 0x69, 
+  0x6d, 0x70, 0x6c, 0x65, 0x20, 0x53, 0x63, 0x61, 
+  0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
+  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 
+  0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 
+  0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 
+  0x64, 0x6f, 0x77, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 
+  0x69, 0x67, 0x75, 0x72, 0x65, 0x5f, 0x65, 0x76, 
+  0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 
+  0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, 
+  0x77, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
+  0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x73, 0x74, 
+  0x61, 0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 
+  0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 
+  0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x77, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 
+  0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x61, 
+  0x69, 0x6e, 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 
+  0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 
+  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 
+  0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x6f, 0x63, 
+  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 
+  0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 
+  0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x28, 0x63, 
+  0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 
+  0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x69, 0x73, 
+  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x2c, 0x20, 0x65, 0x2e, 0x67, 0x2e, 0x20, 
+  0x73, 0x61, 0x76, 0x65, 0x2c, 0x20, 0x70, 0x72, 
+  0x69, 0x6e, 0x74, 0x29, 0x22, 0x3e, 0x5f, 0x44, 
+  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 
+  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x6e, 0x65, 0x77, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
@@ -558,8 +1384,8 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
-  0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
   0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
@@ -575,7 +1401,7 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
   0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
-  0x65, 0x79, 0x3d, 0x22, 0x73, 0x22, 0x20, 0x73, 
+  0x65, 0x79, 0x3d, 0x22, 0x6e, 0x22, 0x20, 0x73, 
   0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
   0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
   0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
@@ -586,66 +1412,11 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
   0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
   0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 0x69, 0x6c, 
-  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 
-  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 
-  0x61, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
-  0x73, 0x61, 0x76, 0x65, 0x2d, 0x61, 0x73, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 
-  0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 
-  0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
-  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x73, 
-  0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 
-  0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 
-  0x44, 0x4b, 0x5f, 0x53, 0x48, 0x49, 0x46, 0x54, 
-  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 
-  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
-  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 
-  0x5f, 0x61, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 
-  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
-  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
-  0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x6e, 0x65, 0x77, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
@@ -653,45 +1424,162 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
   0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
   0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x65, 
-  0x6d, 0x61, 0x69, 0x6c, 0x20, 0x6d, 0x65, 0x6e, 
-  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x5f, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x3c, 0x2f, 
+  0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x53, 0x63, 0x5f, 
+  0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 
+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 
+  0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x73, 0x69, 0x6e, 
+  0x67, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 
+  0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 
+  0x65, 0x72, 0x22, 0x3e, 0x53, 0x69, 0x6e, 0x67, 
+  0x6c, 0x65, 0x20, 0x5f, 0x50, 0x61, 0x67, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
+  0x79, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 
+  0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 
+  0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 
+  0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 
+  0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 
+  0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 
+  0x6c, 0x20, 0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 
+  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 
+  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 
+  0x66, 0x65, 0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 
+  0x41, 0x6c, 0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 
+  0x73, 0x20, 0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 
+  0x46, 0x65, 0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
   0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
-  0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x65, 0x6d, 
-  0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 0x67, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
   0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x22, 0x66, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
   0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
   0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
   0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
@@ -701,29 +1589,232 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
   0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x65, 0x6d, 0x61, 
-  0x69, 0x6c, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 
+  0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 0x73, 0x5f, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
+  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 
+  0x6f, 0x70, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 
+  0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 
+  0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x20, 0x74, 
+  0x6f, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x63, 
+  0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x22, 0x3e, 0x5f, 0x53, 0x74, 
+  0x6f, 0x70, 0x20, 0x53, 0x63, 0x61, 0x6e, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
+  0x3d, 0x22, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 
+  0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x74, 
+  0x6f, 0x70, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 
   0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
   0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x70, 
-  0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
+  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
+  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
+  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x68, 
+  0x6f, 0x74, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
+  0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 
+  0x74, 0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x61, 0x76, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
+  0x6b, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 
+  0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
@@ -738,7 +1829,7 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
   0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x70, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x22, 0x73, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
   0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
   0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
   0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
@@ -748,26 +1839,75 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
   0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 0x69, 
-  0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 
-  0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 
-  0x5f, 0x73, 0x65, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x61, 0x76, 
+  0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 
+  0x65, 0x5f, 0x61, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
   0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
+  0x6b, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x2d, 0x61, 
+  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 
+  0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
+  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
+  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
+  0x65, 0x79, 0x3d, 0x22, 0x73, 0x22, 0x20, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
+  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
+  0x53, 0x48, 0x49, 0x46, 0x54, 0x5f, 0x4d, 0x41, 
+  0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, 
+  0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 
+  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x61, 0x73, 
+  0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
@@ -775,14 +1915,19 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
   0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
   0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 
-  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x70, 0x72, 0x65, 
-  0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 
+  0x69, 0x64, 0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 
+  0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 
+  0x20, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x20, 0x6d, 
+  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x5f, 0x45, 0x6d, 0x61, 0x69, 0x6c, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
@@ -791,6 +1936,148 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 
+  0x65, 0x22, 0x3e, 0x65, 0x6d, 0x61, 0x69, 0x6c, 
+  0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
+  0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x65, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 
+  0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 
+  0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 
+  0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
+  0x69, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x70, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 
+  0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 
+  0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 
+  0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x5f, 0x73, 0x65, 0x70, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
+  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
+  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
+  0x6b, 0x2d, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 
+  0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
   0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
@@ -808,21 +2095,28 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
   0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
   0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 
-  0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x70, 
-  0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x31, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x31, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
@@ -845,16 +2139,30 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
+  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
+  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
+  0x65, 0x79, 0x3d, 0x22, 0x77, 0x22, 0x20, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
+  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
+  0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 
+  0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 
   0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
   0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
   0x22, 0x71, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
@@ -863,23 +2171,16 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
   0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
   0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
-  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
-  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x77, 0x22, 
-  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 
-  0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 
-  0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 
-  0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x71, 0x75, 0x69, 0x74, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
-  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x71, 0x75, 0x69, 
+  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
@@ -899,47 +2200,208 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x50, 0x61, 0x67, 0x65, 0x20, 
-  0x6d, 0x65, 0x6e, 0x75, 0x20, 0x28, 0x63, 0x6f, 
-  0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x61, 
-  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x65, 0x61, 0x63, 0x68, 0x20, 0x70, 
-  0x61, 0x67, 0x65, 0x2c, 0x20, 0x65, 0x2e, 0x67, 
-  0x2e, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
-  0x2c, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x29, 0x22, 
-  0x3e, 0x5f, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x50, 0x61, 
+  0x67, 0x65, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 
+  0x28, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 
+  0x73, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x65, 0x61, 0x63, 
+  0x68, 0x20, 0x70, 0x61, 0x67, 0x65, 0x2c, 0x20, 
+  0x65, 0x2e, 0x67, 0x2e, 0x20, 0x64, 0x65, 0x6c, 
+  0x65, 0x74, 0x65, 0x2c, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x29, 0x22, 0x3e, 0x5f, 0x50, 0x61, 0x67, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 
+  0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 
-  0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 
-  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
-  0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x74, 0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
+  0x6f, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 
+  0x61, 0x6e, 0x74, 0x69, 0x2d, 0x63, 0x6c, 0x6f, 
+  0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x22, 
+  0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
+  0x5f, 0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x62, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x6c, 
+  0x65, 0x66, 0x74, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
+  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 
+  0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 
+  0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 
+  0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 
+  0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 
+  0x29, 0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x5f, 0x52, 0x69, 0x67, 0x68, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
+  0x79, 0x3d, 0x22, 0x62, 0x72, 0x61, 0x63, 0x6b, 
+  0x65, 0x74, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
   0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
   0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
   0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
   0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x63, 0x72, 0x6f, 0x70, 0x20, 0x73, 0x75, 0x62, 
+  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 
+  0x72, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 
+  0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -947,147 +2409,84 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 
-  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
-  0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
-  0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 0x61, 
-  0x6e, 0x74, 0x69, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 
-  0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x22, 0x3e, 
-  0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x5f, 
-  0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
-  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x62, 
-  0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x6c, 0x65, 
-  0x66, 0x74, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 
+  0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
   0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x72, 
-  0x69, 0x67, 0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 
-  0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 
-  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x70, 
-  0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x72, 
-  0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x6c, 
-  0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 
-  0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 
-  0x20, 0x5f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x3c, 
+  0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
-  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
-  0x3d, 0x22, 0x62, 0x72, 0x61, 0x63, 0x6b, 0x65, 
-  0x74, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 
-  0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
-  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
-  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
-  0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
-  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x63, 
-  0x72, 0x6f, 0x70, 0x20, 0x73, 0x75, 0x62, 0x6d, 
-  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 0x72, 
-  0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x6e, 0x6f, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x22, 0x3e, 0x5f, 0x4e, 0x6f, 0x6e, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
-  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x5f, 0x63, 
-  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
+  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x34, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
@@ -1097,18 +2496,15 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
   0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 
   0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 
-  0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x20, 0x63, 0x72, 
-  0x6f, 0x70, 0x22, 0x3e, 0x5f, 0x4e, 0x6f, 0x6e, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 
+  0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 
+  0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x74, 0x6f, 0x20, 0x41, 0x34, 0x20, 0x73, 
+  0x69, 0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 0x34, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
@@ -1117,14 +2513,81 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 
+  0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 
+  0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x61, 0x35, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
+  0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
+  0x6f, 0x20, 0x41, 0x35, 0x20, 0x73, 0x69, 0x7a, 
+  0x65, 0x22, 0x3e, 0x41, 0x5f, 0x35, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
+  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
+  0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 
+  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
   0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
-  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 
-  0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 
+  0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
@@ -1132,7 +2595,7 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 
   0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 
   0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x3d, 0x22, 0x61, 0x36, 0x5f, 0x6d, 0x65, 0x6e, 
   0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
@@ -1140,18 +2603,85 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 
-  0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 
-  0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 
-  0x70, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 
-  0x65, 0x20, 0x74, 0x6f, 0x20, 0x41, 0x34, 0x20, 
-  0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 
-  0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 
+  0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 
+  0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
+  0x41, 0x36, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 
+  0x3e, 0x41, 0x5f, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 
+  0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 
+  0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 
+  0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x36, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 
+  0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
+  0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
+  0x6f, 0x20, 0x55, 0x53, 0x20, 0x6c, 0x65, 0x74, 
+  0x74, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 0x65, 
+  0x22, 0x3e, 0x5f, 0x4c, 0x65, 0x74, 0x74, 0x65, 
+  0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
@@ -1174,144 +2704,46 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 
   0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 
-  0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 
-  0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x61, 0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 
-  0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
-  0x74, 0x6f, 0x20, 0x41, 0x35, 0x20, 0x73, 0x69, 
-  0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 0x35, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
-  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 
-  0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 
-  0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x61, 0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x36, 
+  0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 
   0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 
-  0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 
-  0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
-  0x20, 0x41, 0x36, 0x20, 0x73, 0x69, 0x7a, 0x65, 
-  0x22, 0x3e, 0x41, 0x5f, 0x36, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
-  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
-  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
+  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 
-  0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 
-  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x36, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 
-  0x65, 0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 
-  0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
-  0x74, 0x6f, 0x20, 0x55, 0x53, 0x20, 0x6c, 0x65, 
-  0x74, 0x74, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 
-  0x65, 0x22, 0x3e, 0x5f, 0x4c, 0x65, 0x74, 0x74, 
-  0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
+  0x67, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x20, 0x74, 0x6f, 0x20, 0x55, 0x53, 0x20, 
+  0x6c, 0x65, 0x67, 0x61, 0x6c, 0x20, 0x73, 0x69, 
+  0x7a, 0x65, 0x22, 0x3e, 0x4c, 0x65, 0x5f, 0x67, 
+  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
@@ -1334,120 +2766,73 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
   0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 0x65, 
-  0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x67, 
-  0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 
-  0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x61, 
-  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x55, 0x53, 
-  0x20, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x20, 0x73, 
-  0x69, 0x7a, 0x65, 0x22, 0x3e, 0x4c, 0x65, 0x5f, 
-  0x67, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
-  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
-  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 
-  0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 
+  0x72, 0x3d, 0x22, 0x6c, 0x65, 0x67, 0x61, 0x6c, 
   0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x6c, 0x65, 0x67, 0x61, 
-  0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x34, 0x78, 0x36, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 
-  0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 
-  0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
-  0x20, 0x34, 0x78, 0x36, 0x20, 0x69, 0x6e, 0x63, 
-  0x68, 0x22, 0x3e, 0x34, 0x26, 0x23, 0x78, 0x44, 
-  0x37, 0x3b, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
-  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
-  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
+  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x34, 0x78, 0x36, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 
-  0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x66, 0x6f, 0x75, 0x72, 
-  0x5f, 0x62, 0x79, 0x5f, 0x73, 0x69, 0x78, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 
+  0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 
+  0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
+  0x34, 0x78, 0x36, 0x20, 0x69, 0x6e, 0x63, 0x68, 
+  0x22, 0x3e, 0x34, 0xc3, 0x97, 0x36, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
+  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
+  0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 
+  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x66, 
+  0x6f, 0x75, 0x72, 0x5f, 0x62, 0x79, 0x5f, 0x73, 
+  0x69, 0x78, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
@@ -1465,45 +2850,52 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 
-  0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 
-  0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x74, 
-  0x6f, 0x20, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x73, 0x69, 
-  0x7a, 0x65, 0x22, 0x3e, 0x5f, 0x43, 0x75, 0x73, 
-  0x74, 0x6f, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
-  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
-  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 
-  0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 
-  0x6f, 0x6d, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
+  0x67, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x75, 0x73, 
+  0x74, 0x6f, 0x6d, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x5f, 
+  0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
+  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
+  0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 
+  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 
+  0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
@@ -1519,103 +2911,300 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
   0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x72, 
-  0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
-  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 
-  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
-  0x20, 0x74, 0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 
-  0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 
-  0x72, 0x6f, 0x70, 0x20, 0x61, 0x72, 0x65, 0x61, 
-  0x22, 0x3e, 0x5f, 0x52, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x20, 0x43, 0x72, 0x6f, 0x70, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 
+  0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 
+  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
+  0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x20, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 
+  0x5f, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
+  0x43, 0x72, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x63, 0x72, 0x6f, 0x70, 0x5f, 0x72, 0x6f, 0x74, 
-  0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 0x76, 
+  0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x6d, 0x6f, 0x76, 
+  0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 
+  0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x22, 
+  0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x4c, 0x65, 
+  0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x6c, 
+  0x65, 0x73, 0x73, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 
+  0x76, 0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
+  0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 
+  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
+  0x6f, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 
+  0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x4d, 
+  0x6f, 0x76, 0x65, 0x20, 0x52, 0x69, 0x67, 0x68, 
+  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
+  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
+  0x65, 0x79, 0x3d, 0x22, 0x67, 0x72, 0x65, 0x61, 
+  0x74, 0x65, 0x72, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 
+  0x76, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 
-  0x65, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x74, 
+  0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x70, 0x62, 0x6f, 
+  0x61, 0x72, 0x64, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
   0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x63, 0x6f, 0x70, 0x79, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x63, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
+  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
+  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
+  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 0x70, 0x79, 
+  0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x70, 
+  0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
+  0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x64, 0x65, 0x6c, 
+  0x65, 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
   0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x6d, 
-  0x6f, 0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 
-  0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
-  0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 
-  0x74, 0x22, 0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 
-  0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x6c, 0x65, 0x73, 0x73, 0x22, 0x20, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
-  0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x6c, 0x65, 0x66, 
-  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
+  0x79, 0x3d, 0x22, 0x44, 0x65, 0x6c, 0x65, 0x74, 
+  0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 
+  0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x65, 
+  0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
@@ -1623,13 +3212,17 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
   0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
   0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 
-  0x76, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
@@ -1637,52 +3230,112 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
   0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
   0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 
-  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
-  0x20, 0x74, 0x6f, 0x20, 0x6d, 0x6f, 0x76, 0x65, 
-  0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 0x6c, 
-  0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 
-  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 
-  0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 
-  0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x52, 0x69, 
-  0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 
+  0x68, 0x65, 0x6c, 0x70, 0x20, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x5f, 0x48, 0x65, 0x6c, 0x70, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 
+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 
+  0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 
+  0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 
+  0x74, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x48, 0x65, 0x6c, 0x70, 0x7c, 0x43, 0x6f, 
+  0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 0x6f, 
+  0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
-  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x67, 0x72, 
-  0x65, 0x61, 0x74, 0x65, 0x72, 0x22, 0x20, 0x73, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 
+  0x3e, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x69, 0x6d, 
+  0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
+  0x79, 0x3d, 0x22, 0x46, 0x31, 0x22, 0x20, 0x73, 
   0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
   0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
   0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
   0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
   0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
-  0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 0x69, 0x67, 
-  0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 
-  0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
-  0x6f, 0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 
-  0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 
+  0x72, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 
+  0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 
   0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6f, 
-  0x70, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x61, 0x62, 0x6f, 
+  0x75, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
@@ -1690,8 +3343,8 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 
-  0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
   0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
@@ -1705,431 +3358,172 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
-  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
-  0x3d, 0x22, 0x63, 0x22, 0x20, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 
-  0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 
-  0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 
-  0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 
-  0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 
-  0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 
-  0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
-  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
-  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 
-  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
-  0x6b, 0x2d, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
-  0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 
-  0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 
-  0x6b, 0x65, 0x79, 0x3d, 0x22, 0x44, 0x65, 0x6c, 
-  0x65, 0x74, 0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
   0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
   0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
   0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 
-  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x22, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 
-  0x6c, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 
-  0x6e, 0x20, 0x68, 0x65, 0x6c, 0x70, 0x20, 0x6d, 
-  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x48, 0x65, 
-  0x6c, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 
-  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 
-  0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 
-  0x73, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x48, 0x65, 0x6c, 0x70, 0x7c, 0x43, 0x6f, 0x6e, 
-  0x74, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x6d, 0x65, 
-  0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 0x6f, 0x6e, 
-  0x74, 0x65, 0x6e, 0x74, 0x73, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 
-  0x61, 0x67, 0x65, 0x22, 0x3e, 0x68, 0x65, 0x6c, 
-  0x70, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
-  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
-  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x46, 
-  0x31, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x68, 
-  0x65, 0x6c, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 
-  0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
+  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
   0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
   0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
-  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
-  0x67, 0x74, 0x6b, 0x2d, 0x61, 0x62, 0x6f, 0x75, 
-  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
-  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x62, 0x6f, 
-  0x75, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
-  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x61, 0x72, 0x31, 0x22, 0x3e, 0x3c, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 
+  0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
+  0x61, 0x72, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 
+  0x61, 0x72, 0x79, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x62, 0x61, 0x72, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
+  0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 
+  0x65, 0x77, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
   0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, 
-  0x72, 0x79, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
-  0x61, 0x72, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 
-  0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 
-  0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 
-  0x77, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
-  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
-  0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x65, 0x77, 
-  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
-  0x74, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 
-  0x61, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x64, 0x6f, 
-  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 
   0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
   0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
-  0x74, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x22, 
-  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x65, 0x77, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
-  0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x6e, 0x65, 0x77, 0x20, 0x64, 0x6f, 0x63, 
+  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x74, 
+  0x61, 0x72, 0x74, 0x20, 0x61, 0x20, 0x6e, 0x65, 
+  0x77, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 
+  0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 
-  0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
-  0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
-  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 
-  0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 
-  0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x63, 0x61, 
-  0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 
-  0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
-  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x73, 0x5f, 0x69, 0x6d, 
-  0x70, 0x6f, 0x72, 0x74, 0x61, 0x6e, 0x74, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 
-  0x72, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
-  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
-  0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
+  0x5f, 0x69, 0x64, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 
   0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
-  0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 
+  0x65, 0x77, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 
+  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 
+  0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 
+  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
   0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
   0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
   0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
   0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 
-  0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 
-  0x65, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 
-  0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
-  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 
-  0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 
-  0x73, 0x61, 0x76, 0x65, 0x20, 0x74, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x61, 0x76, 
-  0x65, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x20, 
-  0x66, 0x69, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 
+  0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 
+  0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
+  0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x53, 0x63, 0x61, 0x6e, 0x20, 0x61, 0x20, 
+  0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x20, 0x66, 0x72, 0x6f, 0x6d, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
@@ -2141,101 +3535,40 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
   0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
   0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x61, 
-  0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
-  0x5f, 0x69, 0x64, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
-  0x2d, 0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 
-  0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 0x69, 0x6c, 
-  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 
-  0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
-  0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
-  0x74, 0x6f, 0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
-  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x62, 0x61, 0x72, 0x20, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 
-  0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 
-  0x74, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 
-  0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 
-  0x73, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x3e, 0x53, 0x74, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
+  0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 
+  0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 
-  0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x22, 0x3e, 
-  0x67, 0x74, 0x6b, 0x2d, 0x73, 0x74, 0x6f, 0x70, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x65, 
+  0x6e, 0x75, 0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
   0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
   0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 0x5f, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
-  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x72, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
   0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
@@ -2247,135 +3580,228 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 
   0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x54, 0x6f, 0x6f, 0x6c, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
   0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 
+  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 
+  0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x61, 
+  0x76, 0x65, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 
+  0x65, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 
+  0x20, 0x66, 0x69, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 
-  0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x69, 0x73, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 
+  0x74, 0x61, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 
+  0x61, 0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
-  0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 
-  0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x65, 
-  0x66, 0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 
+  0x6b, 0x5f, 0x69, 0x64, 0x22, 0x3e, 0x67, 0x74, 
+  0x6b, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 0x69, 
+  0x6c, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 
+  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 
+  0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 
+  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 0x6f, 
+  0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 
+  0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 
-  0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
-  0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x6f, 
-  0x74, 0x61, 0x74, 0x65, 0x20, 0x6c, 0x65, 0x66, 
-  0x74, 0x20, 0x28, 0x63, 0x6f, 0x75, 0x6e, 0x74, 
-  0x65, 0x72, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
-  0x77, 0x69, 0x73, 0x65, 0x29, 0x20, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x52, 0x6f, 
-  0x74, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
-  0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 
-  0x74, 0x20, 0x28, 0x63, 0x6f, 0x75, 0x6e, 0x74, 
-  0x65, 0x72, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
-  0x77, 0x69, 0x73, 0x65, 0x29, 0x3c, 0x2f, 0x70, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 
+  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x20, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x53, 0x74, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
   0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
   0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x72, 0x6f, 0x74, 
-  0x61, 0x74, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 0x61, 
-  0x6e, 0x74, 0x69, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 
-  0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x52, 0x6f, 0x74, 
-  0x61, 0x74, 0x65, 0x20, 0x4c, 0x65, 0x66, 0x74, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x3e, 0x53, 0x74, 0x6f, 0x70, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
-  0x6d, 0x65, 0x22, 0x3e, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x2d, 0x72, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
-  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
-  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 
-  0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
-  0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x74, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x74, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x73, 0x74, 0x6f, 
+  0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 
+  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 
+  0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x54, 0x6f, 0x6f, 0x6c, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
   0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 
+  0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
@@ -2387,122 +3813,55 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 
   0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 
   0x72, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
-  0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 
-  0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 
-  0x65, 0x29, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 
-  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 
-  0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 
-  0x28, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 
-  0x73, 0x65, 0x29, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
-  0x6f, 0x6e, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x72, 
-  0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x6c, 
-  0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 
-  0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x52, 
-  0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x52, 0x69, 
-  0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 0x63, 
+  0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x63, 
+  0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 
+  0x29, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 0x63, 
+  0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x63, 
+  0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 
+  0x29, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
-  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x2d, 0x72, 0x6f, 
-  0x74, 0x61, 0x74, 0x65, 0x2d, 0x72, 0x69, 0x67, 
-  0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
-  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
-  0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 
-  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 
-  0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
-  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x54, 0x6f, 0x6f, 
-  0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
-  0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
-  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 
-  0x72, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 
-  0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x69, 0x73, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 
-  0x74, 0x61, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 
+  0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+  0x74, 0x20, 0x28, 0x61, 0x6e, 0x74, 0x69, 0x2d, 
+  0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 
+  0x65, 0x29, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
+  0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 
-  0x72, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
-  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x2d, 0x63, 0x72, 
-  0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
+  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2d, 0x72, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x2d, 0x6c, 0x65, 
+  0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
   0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
   0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
-  0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
   0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
   0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
   0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
@@ -2518,513 +3877,347 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
   0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 
+  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
-  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 
+  0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x20, 0x72, 0x69, 0x67, 
+  0x68, 0x74, 0x20, 0x28, 0x63, 0x6c, 0x6f, 0x63, 
+  0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x20, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x52, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 
+  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
+  0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x6c, 0x6f, 
+  0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 
-  0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 
-  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 
-  0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 
-  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
-  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
-  0x65, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
-  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 
-  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
-  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 
-  0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, 
-  0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x30, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 0x3c, 
-  0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 0x22, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
   0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
   0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
   0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 0x6f, 
-  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x20, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x74, 0x65, 0x78, 0x74, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x6d, 0x6f, 0x64, 0x65, 
-  0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 
-  0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 
-  0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x30, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
-  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 
-  0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 
-  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 
-  0x6f, 0x72, 0x20, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x6f, 
-  0x64, 0x65, 0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 
-  0x6f, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
-  0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 
-  0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
-  0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 
-  0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
-  0x72, 0x65, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 
-  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x64, 0x65, 
-  0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 
-  0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
-  0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 
-  0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
-  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
-  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 
-  0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x5f, 
-  0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 
-  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 
-  0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
-  0x64, 0x61, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 
-  0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x6e, 
-  0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x72, 0x67, 0x65, 0x6e, 0x63, 0x79, 0x5f, 
-  0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x66, 
-  0x6f, 0x72, 0x22, 0x3e, 0x73, 0x69, 0x6d, 0x70, 
-  0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
-  0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 
-  0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 
-  0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 
-  0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x76, 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 
-  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x72, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x20, 0x28, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 
+  0x69, 0x73, 0x65, 0x29, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x52, 0x69, 0x67, 0x68, 0x74, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 
-  0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, 
-  0x6f, 0x72, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x68, 
-  0x69, 0x73, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x20, 
-  0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x61, 
-  0x6c, 0x6c, 0x79, 0x20, 0x61, 0x6e, 0x64, 0x20, 
-  0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 
-  0x64, 0x22, 0x3e, 0x54, 0x6f, 0x20, 0x63, 0x6f, 
-  0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 
-  0x20, 0x3f, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x6e, 
-  0x65, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 
-  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
-  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 
-  0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x22, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 
+  0x65, 0x22, 0x3e, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x2d, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, 
-  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, 
-  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 
-  0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 
-  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 0x6e, 
-  0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 
+  0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
-  0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 0x3e, 0x26, 
-  0x23, 0x78, 0x32, 0x35, 0x43, 0x46, 0x3b, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 
-  0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 
-  0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 
-  0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 
-  0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
   0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
   0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
   0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 
-  0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 
-  0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x54, 0x6f, 
+  0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 
-  0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, 0x46, 
-  0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
-  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
-  0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x43, 0x72, 0x6f, 0x70, 0x20, 
+  0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 
+  0x63, 0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x73, 0x5f, 0x69, 
+  0x6d, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6e, 0x74, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 
-  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 
-  0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x43, 0x72, 0x6f, 0x70, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 
-  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
-  0x65, 0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
-  0x3e, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 
-  0x6d, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 
-  0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 
+  0x65, 0x22, 0x3e, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x2d, 0x63, 0x72, 0x6f, 0x70, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
-  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
-  0x22, 0x3e, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 
-  0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
   0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
   0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 
-  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
-  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 
-  0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 
-  0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 
+  0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
   0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
-  0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
-  0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 
-  0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 
-  0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 
-  0x64, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 
-  0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 
-  0x65, 0x74, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 
-  0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 
-  0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
-  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
-  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
+  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
-  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
-  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 
+  0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 
+  0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 
+  0x70, 0x69, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
+  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
+  0x61, 0x6d, 0x65, 0x20, 0x64, 0x70, 0x69, 0x20, 
+  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
+  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
+  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 
+  0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 0x6c, 0x65, 
+  0x20, 0x6f, 0x66, 0x20, 0x70, 0x72, 0x65, 0x66, 
+  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x20, 
+  0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 
+  0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 
+  0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
+  0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
+  0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 
+  0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 
+  0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 
+  0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
-  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 
+  0x65, 0x6e, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x22, 
+  0x3e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 
+  0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 
+  0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 
+  0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x64, 0x65, 
+  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 
+  0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x70, 0x6f, 
+  0x6e, 0x73, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 
+  0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
   0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
   0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x48, 0x42, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 
-  0x61, 0x72, 0x65, 0x61, 0x31, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 
+  0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x32, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 
+  0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 
+  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 
+  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 
+  0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 
+  0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 
+  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 
+  0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
@@ -3036,215 +4229,108 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
   0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
   0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 
+  0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 
+  0x63, 0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 
   0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
   0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x42, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 
-  0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x20, 0x61, 
-  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 
-  0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x69, 0x61, 
-  0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x5f, 0x41, 0x75, 
-  0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 
-  0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 
-  0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 
   0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 
-  0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 
-  0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
-  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
-  0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
-  0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 
-  0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 
-  0x30, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x68, 0x6f, 
-  0x72, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
-  0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
-  0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 
-  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 
-  0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 
-  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 
-  0x6c, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x70, 0x72, 
-  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
-  0x73, 0x20, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x22, 0x3e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 
-  0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
+  0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 
+  0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
-  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 
-  0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 
+  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
+  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 
-  0x74, 0x22, 0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 
-  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x66, 0x6f, 
-  0x72, 0x22, 0x3e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 
-  0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 
-  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x70, 
+  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 
+  0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
-  0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
-  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, 
-  0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x65, 0x73, 0x70, 
-  0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 
-  0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 
-  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
-  0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 
-  0x67, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
-  0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
-  0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
   0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 
-  0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 
-  0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 
-  0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 
+  0x64, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
   0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 
-  0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 
-  0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 
-  0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x37, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 
+  0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 
+  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
   0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
   0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
@@ -3261,201 +4347,164 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 
-  0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 
-  0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
-  0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 
-  0x20, 0x53, 0x5f, 0x6f, 0x75, 0x72, 0x63, 0x65, 
-  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
-  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
-  0x74, 0x22, 0x3e, 0x64, 0x65, 0x76, 0x69, 0x63, 
-  0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 
-  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 
-  0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
-  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
-  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 
-  0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 
+  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 
+  0x72, 0x63, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x53, 
+  0x63, 0x61, 0x6e, 0x20, 0x53, 0x5f, 0x6f, 0x75, 
+  0x72, 0x63, 0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
-  0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x64, 0x65, 
-  0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
-  0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 0x6e, 0x73, 
-  0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 
-  0x3e, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x68, 0x61, 0x6e, 
-  0x67, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x64, 0x65, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
+  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
+  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x64, 0x65, 
   0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 
-  0x62, 0x6f, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 
+  0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 
-  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
-  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 
-  0x69, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
+  0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 
+  0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
-  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 
-  0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 
-  0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 
-  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
-  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 0x54, 0x65, 
-  0x78, 0x74, 0x20, 0x52, 0x65, 0x73, 0x6f, 0x6c, 
-  0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3c, 0x2f, 
+  0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 
+  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 
+  0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 
+  0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 
+  0x79, 0x22, 0x3e, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x68, 
+  0x61, 0x6e, 0x67, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x5f, 0x63, 0x68, 0x61, 
+  0x6e, 0x67, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
+  0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
-  0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
-  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
-  0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 
-  0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 
-  0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 
-  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
-  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
-  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 
-  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 
-  0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 
-  0x69, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
-  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 
-  0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 
-  0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 
-  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
-  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 0x50, 0x68, 
-  0x6f, 0x74, 0x6f, 0x20, 0x52, 0x65, 0x73, 0x6f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 
+  0x63, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 0x54, 
+  0x65, 0x78, 0x74, 0x20, 0x52, 0x65, 0x73, 0x6f, 
   0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
@@ -3468,95 +4517,178 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
   0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
-  0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
-  0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x3e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 
+  0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
   0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 
-  0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
+  0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
-  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
-  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 
-  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
-  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
-  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
   0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 
-  0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 
-  0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 
+  0x64, 0x70, 0x69, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 
+  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 
+  0x64, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
+  0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 
+  0x22, 0x3e, 0x5f, 0x50, 0x68, 0x6f, 0x74, 0x6f, 
+  0x20, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 
-  0x65, 0x6c, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 
-  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x73, 0x74, 0x6f, 
-  0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
+  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
+  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x68, 
+  0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
+  0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 
+  0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 
+  0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
+  0x64, 0x65, 0x6c, 0x22, 0x3e, 0x74, 0x65, 0x78, 
+  0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x73, 0x74, 
+  0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 
+  0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
+  0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 
-  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
-  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 
-  0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 
-  0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 
-  0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 
+  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
@@ -3574,94 +4706,89 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 
-  0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 
-  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
-  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
-  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 
-  0x69, 0x64, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 
-  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 
+  0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 
+  0x67, 0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
-  0x73, 0x63, 0x61, 0x6e, 0x20, 0x73, 0x69, 0x64, 
-  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
-  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 
-  0x6e, 0x20, 0x53, 0x69, 0x64, 0x65, 0x3a, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
-  0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
-  0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
-  0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
+  0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 
+  0x20, 0x53, 0x69, 0x64, 0x65, 0x3a, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
+  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 
+  0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
   0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
   0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 
-  0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
+  0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
-  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
-  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 
-  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
-  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
-  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
   0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
   0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
@@ -3678,194 +4805,324 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
-  0x64, 0x65, 0x6c, 0x22, 0x3e, 0x70, 0x61, 0x67, 
-  0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x73, 
-  0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x64, 
+  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
+  0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 
+  0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 
+  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 
+  0x69, 0x64, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x63, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x50, 0x61, 0x67, 0x65, 0x20, 0x53, 0x69, 
+  0x7a, 0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 
+  0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 
+  0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x68, 0x6f, 
+  0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 
+  0x73, 0x69, 0x7a, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 
+  0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x70, 0x61, 
+  0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 
+  0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
   0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
   0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 
-  0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 
-  0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 
-  0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 
-  0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x70, 0x61, 0x70, 0x65, 0x72, 
-  0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
+  0x65, 0x73, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 
+  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 
+  0x64, 0x65, 0x20, 0x62, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x6e, 0x65, 0x73, 0x73, 0x20, 0x73, 0x63, 
+  0x61, 0x6c, 0x65, 0x22, 0x3e, 0x42, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x3a, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
+  0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
+  0x65, 0x73, 0x73, 0x5f, 0x73, 0x63, 0x61, 0x6c, 
+  0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 
+  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 
-  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 
+  0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
+  0x3e, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
+  0x65, 0x73, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 
+  0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 
-  0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 
-  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x73, 
-  0x69, 0x7a, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 
-  0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x50, 
-  0x61, 0x67, 0x65, 0x20, 0x53, 0x69, 0x7a, 0x65, 
-  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
-  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
-  0x74, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
-  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 
-  0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 
+  0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
   0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
-  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
-  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
-  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
-  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 
-  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
-  0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 
-  0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 
-  0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 
-  0x7a, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
-  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 
-  0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 
+  0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 
+  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 
-  0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 
-  0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
-  0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
-  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
+  0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 
+  0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
-  0x65, 0x73, 0x73, 0x20, 0x73, 0x63, 0x61, 0x6c, 
-  0x65, 0x22, 0x3e, 0x42, 0x72, 0x69, 0x67, 0x68, 
-  0x74, 0x6e, 0x65, 0x73, 0x73, 0x3a, 0x3c, 0x2f, 
+  0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 
+  0x73, 0x69, 0x64, 0x65, 0x20, 0x63, 0x6f, 0x6e, 
+  0x74, 0x72, 0x61, 0x73, 0x74, 0x20, 0x73, 0x63, 
+  0x61, 0x6c, 0x65, 0x22, 0x3e, 0x43, 0x6f, 0x6e, 
+  0x74, 0x72, 0x61, 0x73, 0x74, 0x3a, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -3877,43 +5134,39 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
   0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
   0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
-  0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 
-  0x73, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
-  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 
-  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
-  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 0x74, 
+  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 
-  0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 
-  0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, 0x6c, 
-  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
-  0x73, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
+  0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
+  0x74, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -3926,39 +5179,42 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 
-  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x62, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
-  0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
-  0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x63, 
+  0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 
+  0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 
+  0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 
+  0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
-  0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 
-  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
-  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 
-  0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
   0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
@@ -3967,199 +5223,68 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
   0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
   0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
-  0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
-  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
+  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
-  0x74, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 
-  0x3e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
-  0x74, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 
-  0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 
-  0x65, 0x74, 0x22, 0x3e, 0x63, 0x6f, 0x6e, 0x74, 
-  0x72, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x63, 0x61, 
-  0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 
+  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
+  0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x20, 
+  0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x51, 
+  0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x3a, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
-  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
-  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
-  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
-  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 
-  0x72, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x63, 0x61, 
-  0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 
-  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x3e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
-  0x73, 0x74, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
-  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 
-  0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
-  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
-  0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
+  0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
+  0x3e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
+  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
   0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 
-  0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
-  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
-  0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 
-  0x51, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x3a, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
-  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
-  0x22, 0x3e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 
-  0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
   0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
   0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 
-  0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 
-  0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 
-  0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 
-  0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 
-  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
-  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
   0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
@@ -4182,6 +5307,11 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
   0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x71, 0x75, 
   0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x61, 0x64, 
@@ -4202,184 +5332,162 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 
-  0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
   0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 
-  0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x48, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 
-  0x72, 0x65, 0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 
+  0x73, 0x65, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x70, 
+  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
+  0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 
+  0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
+  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
   0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x79, 
-  0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
-  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
-  0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
-  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
-  0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
-  0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 
-  0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 
+  0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 
+  0x65, 0x72, 0x22, 0x3e, 0x53, 0x69, 0x6e, 0x67, 
+  0x6c, 0x65, 0x20, 0x5f, 0x50, 0x61, 0x67, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x61, 0x6c, 0x6c, 
+  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
   0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 
-  0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 
-  0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
-  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 
-  0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
-  0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 
-  0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
-  0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 
-  0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x31, 0x22, 
-  0x3e, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
-  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 
-  0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
-  0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
-  0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
-  0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 
-  0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 
-  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
-  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
-  0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
-  0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x66, 0x72, 
-  0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x3e, 
-  0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x5f, 
-  0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 0x66, 0x72, 
+  0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 0x6f, 0x63, 
+  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x65, 
+  0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x41, 0x6c, 
+  0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 0x73, 0x20, 
+  0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 0x46, 0x65, 
+  0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
@@ -4390,18 +5498,41 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
   0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x63, 
-  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 
+  0x6e, 0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 0x73, 
+  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
-  0x63, 0x61, 0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 
+  0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 
   0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
   0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
   0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
@@ -4411,422 +5542,111 @@ static const SECTION union { const guint8 data[38553]; const double alignment; v
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
-  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
-  0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
-  0x61, 0x6c, 0x6c, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 
-  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
-  0x74, 0x20, 0x66, 0x65, 0x65, 0x64, 0x65, 0x72, 
-  0x22, 0x3e, 0x41, 0x6c, 0x6c, 0x20, 0x50, 0x61, 
-  0x67, 0x65, 0x73, 0x20, 0x46, 0x72, 0x6f, 0x6d, 
-  0x20, 0x5f, 0x46, 0x65, 0x65, 0x64, 0x65, 0x72, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 
-  0x75, 0x6f, 0x75, 0x73, 0x5f, 0x73, 0x63, 0x61, 
-  0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x31, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 
-  0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
-  0x65, 0x78, 0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
-  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 0x65, 
-  0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 
-  0x6f, 0x74, 0x6f, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
+  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 0x65, 0x78, 
+  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 
+  0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 
+  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
-  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 
-  0x6f, 0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 
-  0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
-  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
-  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
-  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 
-  0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 
-  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
-  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
-  0x65, 0x20, 0x64, 0x70, 0x69, 0x20, 0x2d, 0x2d, 
-  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 
-  0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 
-  0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 
-  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 
-  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 
-  0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
-  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
-  0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
-  0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
-  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
-  0x20, 0x64, 0x70, 0x69, 0x20, 0x2d, 0x2d, 0x3e, 
-  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 
-  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x69, 
-  0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 
-  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
-  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 
-  0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
-  0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x69, 
-  0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 
-  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
-  0x2d, 0x68, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6d, 
-  0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 0x67, 
-  0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
-  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6d, 0x61, 
-  0x69, 0x6c, 0x2d, 0x73, 0x65, 0x6e, 0x64, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 
-  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
-  0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 
-  0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 
-  0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x73, 
-  0x69, 0x64, 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
-  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 
-  0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 
-  0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 
-  0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 
-  0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 
-  0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 
-  0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 
-  0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 
-  0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
-  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
-  0x62, 0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 
-  0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x62, 
-  0x6f, 0x74, 0x68, 0x20, 0x73, 0x69, 0x64, 0x65, 
-  0x73, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 
-  0x61, 0x67, 0x65, 0x22, 0x3e, 0x46, 0x72, 0x6f, 
-  0x6e, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x42, 
-  0x61, 0x63, 0x6b, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
-  0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
-  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 
-  0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
-  0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 
-  0x6e, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 
-  0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x20, 0x73, 
-  0x69, 0x64, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x46, 
-  0x72, 0x6f, 0x6e, 0x74, 0x3c, 0x2f, 0x63, 0x6f, 
-  0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 
-  0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 
-  0x3e, 0x32, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
-  0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
-  0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 
-  0x65, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x73, 
-  0x69, 0x64, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 
-  0x20, 0x70, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x42, 
-  0x61, 0x63, 0x6b, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
-  0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
-  0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 
-  0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 
-  0x7a, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
-  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
-  0x61, 0x6d, 0x65, 0x20, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
-  0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
-  0x6d, 0x65, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 
-  0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
-  0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
-  0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
-  0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 
-  0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 
-  0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x62, 0x72, 0x69, 0x67, 
-  0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x61, 
-  0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 
-  0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x6f, 0x77, 0x65, 0x72, 
-  0x22, 0x3e, 0x2d, 0x31, 0x30, 0x30, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x70, 0x70, 0x65, 0x72, 0x22, 0x3e, 
-  0x31, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 
-  0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x3c, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, 
-  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
-  0x73, 0x74, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
-  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x6f, 0x77, 0x65, 0x72, 0x22, 0x3e, 0x2d, 0x31, 
-  0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 
-  0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 
-  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
-  0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 
-  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x75, 
-  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x61, 0x64, 
-  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x22, 
-  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
+  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 
-  0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 
-  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
-  0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 
-  0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 
-  0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 
-  0x29
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
+  0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 
+  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 
+  0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 
+  0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6f, 
+  0x72, 0x67, 0x2f, 0x00, 0x03, 0x00, 0x00, 0x00, 
+  0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 
+  0x04, 0x00, 0x00, 0x00, 0x53, 0x69, 0x6d, 0x70, 
+  0x6c, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x2f, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
+  0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
 } };
 
 static GStaticResource static_resource = { simple_scan_resource_data.data, sizeof (simple_scan_resource_data.data), NULL, NULL, NULL };
diff --git a/src/scanner.c b/src/scanner.c
index b67db5e..de389f6 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.20.1, the Vala compiler
+/* scanner.c generated by valac 0.22.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -936,6 +936,8 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gboolean value, gboolean* _result_);
 static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gint value, gint* _result_);
 static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_);
+static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_);
+static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index);
 static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, const gchar* value, gchar** _result_);
 static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gchar** values, int values_length1, gchar** _result_);
 static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descriptor* option);
@@ -948,6 +950,7 @@ static void scanner_do_open (Scanner* self);
 static void _g_free0_ (gpointer var);
 static void scanner_do_get_option (Scanner* self);
 static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_Handle handle, const gchar* name, gint* index);
+static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor* option, gdouble size, gdouble dpi);
 static void scanner_do_complete_document (Scanner* self);
 static void scanner_do_start (Scanner* self);
 static void scanner_do_get_parameters (Scanner* self);
@@ -978,21 +981,21 @@ ScanDevice* scan_device_construct (GType object_type) {
 	self = (ScanDevice*) g_type_create_instance (object_type);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 982 "scanner.c"
+#line 985 "scanner.c"
 }
 
 
 ScanDevice* scan_device_new (void) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_device_construct (TYPE_SCAN_DEVICE);
-#line 989 "scanner.c"
+#line 992 "scanner.c"
 }
 
 
 static void value_scan_device_init (GValue* value) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 996 "scanner.c"
+#line 999 "scanner.c"
 }
 
 
@@ -1001,7 +1004,7 @@ static void value_scan_device_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (value->data[0].v_pointer);
-#line 1005 "scanner.c"
+#line 1008 "scanner.c"
 	}
 }
 
@@ -1011,11 +1014,11 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_device_ref (src_value->data[0].v_pointer);
-#line 1015 "scanner.c"
+#line 1018 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1019 "scanner.c"
+#line 1022 "scanner.c"
 	}
 }
 
@@ -1023,37 +1026,37 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_scan_device_peek_pointer (const GValue* value) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1027 "scanner.c"
+#line 1030 "scanner.c"
 }
 
 
 static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1034 "scanner.c"
+#line 1037 "scanner.c"
 		ScanDevice* object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1041 "scanner.c"
+#line 1044 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1045 "scanner.c"
+#line 1048 "scanner.c"
 		}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_device_ref (object);
-#line 1049 "scanner.c"
+#line 1052 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1053 "scanner.c"
+#line 1056 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1057 "scanner.c"
+#line 1060 "scanner.c"
 }
 
 
@@ -1064,25 +1067,25 @@ static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1068 "scanner.c"
+#line 1071 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1074 "scanner.c"
+#line 1077 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1078 "scanner.c"
+#line 1081 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_device_ref (value->data[0].v_pointer);
-#line 1082 "scanner.c"
+#line 1085 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1086 "scanner.c"
+#line 1089 "scanner.c"
 }
 
 
@@ -1096,7 +1099,7 @@ GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1100 "scanner.c"
+#line 1103 "scanner.c"
 }
 
 
@@ -1105,7 +1108,7 @@ gpointer value_get_scan_device (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE), NULL);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1109 "scanner.c"
+#line 1112 "scanner.c"
 }
 
 
@@ -1125,17 +1128,17 @@ void value_set_scan_device (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_ref (value->data[0].v_pointer);
-#line 1129 "scanner.c"
+#line 1132 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1133 "scanner.c"
+#line 1136 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
-#line 1139 "scanner.c"
+#line 1142 "scanner.c"
 	}
 }
 
@@ -1154,17 +1157,17 @@ void value_take_scan_device (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1158 "scanner.c"
+#line 1161 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1162 "scanner.c"
+#line 1165 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
-#line 1168 "scanner.c"
+#line 1171 "scanner.c"
 	}
 }
 
@@ -1174,14 +1177,14 @@ static void scan_device_class_init (ScanDeviceClass * klass) {
 	scan_device_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_DEVICE_CLASS (klass)->finalize = scan_device_finalize;
-#line 1178 "scanner.c"
+#line 1181 "scanner.c"
 }
 
 
 static void scan_device_instance_init (ScanDevice * self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1185 "scanner.c"
+#line 1188 "scanner.c"
 }
 
 
@@ -1193,7 +1196,7 @@ static void scan_device_finalize (ScanDevice* obj) {
 	_g_free0 (self->name);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
-#line 1197 "scanner.c"
+#line 1200 "scanner.c"
 }
 
 
@@ -1218,7 +1221,7 @@ gpointer scan_device_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1222 "scanner.c"
+#line 1225 "scanner.c"
 }
 
 
@@ -1231,7 +1234,7 @@ void scan_device_unref (gpointer instance) {
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1235 "scanner.c"
+#line 1238 "scanner.c"
 	}
 }
 
@@ -1242,21 +1245,21 @@ ScanPageInfo* scan_page_info_construct (GType object_type) {
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1246 "scanner.c"
+#line 1249 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
-#line 1253 "scanner.c"
+#line 1256 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1260 "scanner.c"
+#line 1263 "scanner.c"
 }
 
 
@@ -1265,7 +1268,7 @@ static void value_scan_page_info_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
-#line 1269 "scanner.c"
+#line 1272 "scanner.c"
 	}
 }
 
@@ -1275,11 +1278,11 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_page_info_ref (src_value->data[0].v_pointer);
-#line 1279 "scanner.c"
+#line 1282 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1283 "scanner.c"
+#line 1286 "scanner.c"
 	}
 }
 
@@ -1287,37 +1290,37 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1291 "scanner.c"
+#line 1294 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1298 "scanner.c"
+#line 1301 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1305 "scanner.c"
+#line 1308 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1309 "scanner.c"
+#line 1312 "scanner.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
-#line 1313 "scanner.c"
+#line 1316 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1317 "scanner.c"
+#line 1320 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1321 "scanner.c"
+#line 1324 "scanner.c"
 }
 
 
@@ -1328,25 +1331,25 @@ static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1332 "scanner.c"
+#line 1335 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1338 "scanner.c"
+#line 1341 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1342 "scanner.c"
+#line 1345 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
-#line 1346 "scanner.c"
+#line 1349 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1350 "scanner.c"
+#line 1353 "scanner.c"
 }
 
 
@@ -1360,7 +1363,7 @@ GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1364 "scanner.c"
+#line 1367 "scanner.c"
 }
 
 
@@ -1369,7 +1372,7 @@ gpointer value_get_scan_page_info (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1373 "scanner.c"
+#line 1376 "scanner.c"
 }
 
 
@@ -1389,17 +1392,17 @@ void value_set_scan_page_info (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
-#line 1393 "scanner.c"
+#line 1396 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1397 "scanner.c"
+#line 1400 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1403 "scanner.c"
+#line 1406 "scanner.c"
 	}
 }
 
@@ -1418,17 +1421,17 @@ void value_take_scan_page_info (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1422 "scanner.c"
+#line 1425 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1426 "scanner.c"
+#line 1429 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1432 "scanner.c"
+#line 1435 "scanner.c"
 	}
 }
 
@@ -1438,14 +1441,14 @@ static void scan_page_info_class_init (ScanPageInfoClass * klass) {
 	scan_page_info_parent_class = g_type_class_peek_parent (klass);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_PAGE_INFO_CLASS (klass)->finalize = scan_page_info_finalize;
-#line 1442 "scanner.c"
+#line 1445 "scanner.c"
 }
 
 
 static void scan_page_info_instance_init (ScanPageInfo * self) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1449 "scanner.c"
+#line 1452 "scanner.c"
 }
 
 
@@ -1455,7 +1458,7 @@ static void scan_page_info_finalize (ScanPageInfo* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_PAGE_INFO, ScanPageInfo);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 1459 "scanner.c"
+#line 1462 "scanner.c"
 }
 
 
@@ -1480,7 +1483,7 @@ gpointer scan_page_info_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1484 "scanner.c"
+#line 1487 "scanner.c"
 }
 
 
@@ -1493,7 +1496,7 @@ void scan_page_info_unref (gpointer instance) {
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1497 "scanner.c"
+#line 1500 "scanner.c"
 	}
 }
 
@@ -1504,21 +1507,21 @@ ScanLine* scan_line_construct (GType object_type) {
 	self = (ScanLine*) g_type_create_instance (object_type);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1508 "scanner.c"
+#line 1511 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
-#line 1515 "scanner.c"
+#line 1518 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1522 "scanner.c"
+#line 1525 "scanner.c"
 }
 
 
@@ -1527,7 +1530,7 @@ static void value_scan_line_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
-#line 1531 "scanner.c"
+#line 1534 "scanner.c"
 	}
 }
 
@@ -1537,11 +1540,11 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_line_ref (src_value->data[0].v_pointer);
-#line 1541 "scanner.c"
+#line 1544 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1545 "scanner.c"
+#line 1548 "scanner.c"
 	}
 }
 
@@ -1549,37 +1552,37 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_scan_line_peek_pointer (const GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1553 "scanner.c"
+#line 1556 "scanner.c"
 }
 
 
 static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1560 "scanner.c"
+#line 1563 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1567 "scanner.c"
+#line 1570 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1571 "scanner.c"
+#line 1574 "scanner.c"
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
-#line 1575 "scanner.c"
+#line 1578 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1579 "scanner.c"
+#line 1582 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1583 "scanner.c"
+#line 1586 "scanner.c"
 }
 
 
@@ -1590,25 +1593,25 @@ static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1594 "scanner.c"
+#line 1597 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1600 "scanner.c"
+#line 1603 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1604 "scanner.c"
+#line 1607 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
-#line 1608 "scanner.c"
+#line 1611 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1612 "scanner.c"
+#line 1615 "scanner.c"
 }
 
 
@@ -1622,7 +1625,7 @@ GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1626 "scanner.c"
+#line 1629 "scanner.c"
 }
 
 
@@ -1631,7 +1634,7 @@ gpointer value_get_scan_line (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1635 "scanner.c"
+#line 1638 "scanner.c"
 }
 
 
@@ -1651,17 +1654,17 @@ void value_set_scan_line (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
-#line 1655 "scanner.c"
+#line 1658 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1659 "scanner.c"
+#line 1662 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1665 "scanner.c"
+#line 1668 "scanner.c"
 	}
 }
 
@@ -1680,17 +1683,17 @@ void value_take_scan_line (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1684 "scanner.c"
+#line 1687 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1688 "scanner.c"
+#line 1691 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1694 "scanner.c"
+#line 1697 "scanner.c"
 	}
 }
 
@@ -1700,14 +1703,14 @@ static void scan_line_class_init (ScanLineClass * klass) {
 	scan_line_parent_class = g_type_class_peek_parent (klass);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_LINE_CLASS (klass)->finalize = scan_line_finalize;
-#line 1704 "scanner.c"
+#line 1707 "scanner.c"
 }
 
 
 static void scan_line_instance_init (ScanLine * self) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1711 "scanner.c"
+#line 1714 "scanner.c"
 }
 
 
@@ -1717,7 +1720,7 @@ static void scan_line_finalize (ScanLine* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_LINE, ScanLine);
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
-#line 1721 "scanner.c"
+#line 1724 "scanner.c"
 }
 
 
@@ -1742,7 +1745,7 @@ gpointer scan_line_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1746 "scanner.c"
+#line 1749 "scanner.c"
 }
 
 
@@ -1755,7 +1758,7 @@ void scan_line_unref (gpointer instance) {
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1759 "scanner.c"
+#line 1762 "scanner.c"
 	}
 }
 
@@ -1790,21 +1793,21 @@ ScanOptions* scan_options_construct (GType object_type) {
 	self = (ScanOptions*) g_type_create_instance (object_type);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1794 "scanner.c"
+#line 1797 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
-#line 1801 "scanner.c"
+#line 1804 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1808 "scanner.c"
+#line 1811 "scanner.c"
 }
 
 
@@ -1813,7 +1816,7 @@ static void value_scan_options_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
-#line 1817 "scanner.c"
+#line 1820 "scanner.c"
 	}
 }
 
@@ -1823,11 +1826,11 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_options_ref (src_value->data[0].v_pointer);
-#line 1827 "scanner.c"
+#line 1830 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1831 "scanner.c"
+#line 1834 "scanner.c"
 	}
 }
 
@@ -1835,37 +1838,37 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_scan_options_peek_pointer (const GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1839 "scanner.c"
+#line 1842 "scanner.c"
 }
 
 
 static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1846 "scanner.c"
+#line 1849 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1853 "scanner.c"
+#line 1856 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1857 "scanner.c"
+#line 1860 "scanner.c"
 		}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
-#line 1861 "scanner.c"
+#line 1864 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1865 "scanner.c"
+#line 1868 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1869 "scanner.c"
+#line 1872 "scanner.c"
 }
 
 
@@ -1876,25 +1879,25 @@ static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1880 "scanner.c"
+#line 1883 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1886 "scanner.c"
+#line 1889 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1890 "scanner.c"
+#line 1893 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
-#line 1894 "scanner.c"
+#line 1897 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1898 "scanner.c"
+#line 1901 "scanner.c"
 }
 
 
@@ -1908,7 +1911,7 @@ GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1912 "scanner.c"
+#line 1915 "scanner.c"
 }
 
 
@@ -1917,7 +1920,7 @@ gpointer value_get_scan_options (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1921 "scanner.c"
+#line 1924 "scanner.c"
 }
 
 
@@ -1937,17 +1940,17 @@ void value_set_scan_options (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
-#line 1941 "scanner.c"
+#line 1944 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1945 "scanner.c"
+#line 1948 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1951 "scanner.c"
+#line 1954 "scanner.c"
 	}
 }
 
@@ -1966,17 +1969,17 @@ void value_take_scan_options (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1970 "scanner.c"
+#line 1973 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1974 "scanner.c"
+#line 1977 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1980 "scanner.c"
+#line 1983 "scanner.c"
 	}
 }
 
@@ -1986,14 +1989,14 @@ static void scan_options_class_init (ScanOptionsClass * klass) {
 	scan_options_parent_class = g_type_class_peek_parent (klass);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_OPTIONS_CLASS (klass)->finalize = scan_options_finalize;
-#line 1990 "scanner.c"
+#line 1993 "scanner.c"
 }
 
 
 static void scan_options_instance_init (ScanOptions * self) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1997 "scanner.c"
+#line 2000 "scanner.c"
 }
 
 
@@ -2001,7 +2004,7 @@ static void scan_options_finalize (ScanOptions* obj) {
 	ScanOptions * self;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
-#line 2005 "scanner.c"
+#line 2008 "scanner.c"
 }
 
 
@@ -2026,7 +2029,7 @@ gpointer scan_options_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2030 "scanner.c"
+#line 2033 "scanner.c"
 }
 
 
@@ -2039,7 +2042,7 @@ void scan_options_unref (gpointer instance) {
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2043 "scanner.c"
+#line 2046 "scanner.c"
 	}
 }
 
@@ -2050,21 +2053,21 @@ ScanJob* scan_job_construct (GType object_type) {
 	self = (ScanJob*) g_type_create_instance (object_type);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2054 "scanner.c"
+#line 2057 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
-#line 2061 "scanner.c"
+#line 2064 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2068 "scanner.c"
+#line 2071 "scanner.c"
 }
 
 
@@ -2073,7 +2076,7 @@ static void value_scan_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
-#line 2077 "scanner.c"
+#line 2080 "scanner.c"
 	}
 }
 
@@ -2083,11 +2086,11 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_job_ref (src_value->data[0].v_pointer);
-#line 2087 "scanner.c"
+#line 2090 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2091 "scanner.c"
+#line 2094 "scanner.c"
 	}
 }
 
@@ -2095,37 +2098,37 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_scan_job_peek_pointer (const GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2099 "scanner.c"
+#line 2102 "scanner.c"
 }
 
 
 static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2106 "scanner.c"
+#line 2109 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2113 "scanner.c"
+#line 2116 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2117 "scanner.c"
+#line 2120 "scanner.c"
 		}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
-#line 2121 "scanner.c"
+#line 2124 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2125 "scanner.c"
+#line 2128 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2129 "scanner.c"
+#line 2132 "scanner.c"
 }
 
 
@@ -2136,25 +2139,25 @@ static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2140 "scanner.c"
+#line 2143 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2146 "scanner.c"
+#line 2149 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2150 "scanner.c"
+#line 2153 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
-#line 2154 "scanner.c"
+#line 2157 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2158 "scanner.c"
+#line 2161 "scanner.c"
 }
 
 
@@ -2168,7 +2171,7 @@ GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2172 "scanner.c"
+#line 2175 "scanner.c"
 }
 
 
@@ -2177,7 +2180,7 @@ gpointer value_get_scan_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2181 "scanner.c"
+#line 2184 "scanner.c"
 }
 
 
@@ -2197,17 +2200,17 @@ void value_set_scan_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
-#line 2201 "scanner.c"
+#line 2204 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2205 "scanner.c"
+#line 2208 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2211 "scanner.c"
+#line 2214 "scanner.c"
 	}
 }
 
@@ -2226,17 +2229,17 @@ void value_take_scan_job (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2230 "scanner.c"
+#line 2233 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2234 "scanner.c"
+#line 2237 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2240 "scanner.c"
+#line 2243 "scanner.c"
 	}
 }
 
@@ -2246,14 +2249,14 @@ static void scan_job_class_init (ScanJobClass * klass) {
 	scan_job_parent_class = g_type_class_peek_parent (klass);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_JOB_CLASS (klass)->finalize = scan_job_finalize;
-#line 2250 "scanner.c"
+#line 2253 "scanner.c"
 }
 
 
 static void scan_job_instance_init (ScanJob * self) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2257 "scanner.c"
+#line 2260 "scanner.c"
 }
 
 
@@ -2263,7 +2266,7 @@ static void scan_job_finalize (ScanJob* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_JOB, ScanJob);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 2267 "scanner.c"
+#line 2270 "scanner.c"
 }
 
 
@@ -2288,7 +2291,7 @@ gpointer scan_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2292 "scanner.c"
+#line 2295 "scanner.c"
 }
 
 
@@ -2301,7 +2304,7 @@ void scan_job_unref (gpointer instance) {
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2305 "scanner.c"
+#line 2308 "scanner.c"
 	}
 }
 
@@ -2312,21 +2315,21 @@ Request* request_construct (GType object_type) {
 	self = (Request*) g_type_create_instance (object_type);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2316 "scanner.c"
+#line 2319 "scanner.c"
 }
 
 
 Request* request_new (void) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
-#line 2323 "scanner.c"
+#line 2326 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2330 "scanner.c"
+#line 2333 "scanner.c"
 }
 
 
@@ -2335,7 +2338,7 @@ static void value_request_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
-#line 2339 "scanner.c"
+#line 2342 "scanner.c"
 	}
 }
 
@@ -2345,11 +2348,11 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = request_ref (src_value->data[0].v_pointer);
-#line 2349 "scanner.c"
+#line 2352 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2353 "scanner.c"
+#line 2356 "scanner.c"
 	}
 }
 
@@ -2357,37 +2360,37 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_request_peek_pointer (const GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2361 "scanner.c"
+#line 2364 "scanner.c"
 }
 
 
 static gchar* value_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2368 "scanner.c"
+#line 2371 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2375 "scanner.c"
+#line 2378 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2379 "scanner.c"
+#line 2382 "scanner.c"
 		}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
-#line 2383 "scanner.c"
+#line 2386 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2387 "scanner.c"
+#line 2390 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2391 "scanner.c"
+#line 2394 "scanner.c"
 }
 
 
@@ -2398,25 +2401,25 @@ static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2402 "scanner.c"
+#line 2405 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2408 "scanner.c"
+#line 2411 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2412 "scanner.c"
+#line 2415 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
-#line 2416 "scanner.c"
+#line 2419 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2420 "scanner.c"
+#line 2423 "scanner.c"
 }
 
 
@@ -2430,7 +2433,7 @@ GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2434 "scanner.c"
+#line 2437 "scanner.c"
 }
 
 
@@ -2439,7 +2442,7 @@ gpointer value_get_request (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2443 "scanner.c"
+#line 2446 "scanner.c"
 }
 
 
@@ -2459,17 +2462,17 @@ void value_set_request (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
-#line 2463 "scanner.c"
+#line 2466 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2467 "scanner.c"
+#line 2470 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2473 "scanner.c"
+#line 2476 "scanner.c"
 	}
 }
 
@@ -2488,17 +2491,17 @@ void value_take_request (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2492 "scanner.c"
+#line 2495 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2496 "scanner.c"
+#line 2499 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2502 "scanner.c"
+#line 2505 "scanner.c"
 	}
 }
 
@@ -2508,14 +2511,14 @@ static void request_class_init (RequestClass * klass) {
 	request_parent_class = g_type_class_peek_parent (klass);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (klass)->finalize = request_finalize;
-#line 2512 "scanner.c"
+#line 2515 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2519 "scanner.c"
+#line 2522 "scanner.c"
 }
 
 
@@ -2523,7 +2526,7 @@ static void request_finalize (Request* obj) {
 	Request * self;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
-#line 2527 "scanner.c"
+#line 2530 "scanner.c"
 }
 
 
@@ -2548,7 +2551,7 @@ gpointer request_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2552 "scanner.c"
+#line 2555 "scanner.c"
 }
 
 
@@ -2561,7 +2564,7 @@ void request_unref (gpointer instance) {
 		REQUEST_GET_CLASS (self)->finalize (self);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2565 "scanner.c"
+#line 2568 "scanner.c"
 	}
 }
 
@@ -2572,21 +2575,21 @@ RequestRedetect* request_redetect_construct (GType object_type) {
 	self = (RequestRedetect*) request_construct (object_type);
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2576 "scanner.c"
+#line 2579 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
-#line 2583 "scanner.c"
+#line 2586 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
-#line 2590 "scanner.c"
+#line 2593 "scanner.c"
 }
 
 
@@ -2612,21 +2615,21 @@ RequestCancel* request_cancel_construct (GType object_type) {
 	self = (RequestCancel*) request_construct (object_type);
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2616 "scanner.c"
+#line 2619 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
-#line 2623 "scanner.c"
+#line 2626 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
-#line 2630 "scanner.c"
+#line 2633 "scanner.c"
 }
 
 
@@ -2652,14 +2655,14 @@ RequestStartScan* request_start_scan_construct (GType object_type) {
 	self = (RequestStartScan*) request_construct (object_type);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2656 "scanner.c"
+#line 2659 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
-#line 2663 "scanner.c"
+#line 2666 "scanner.c"
 }
 
 
@@ -2668,7 +2671,7 @@ static void request_start_scan_class_init (RequestStartScanClass * klass) {
 	request_start_scan_parent_class = g_type_class_peek_parent (klass);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (klass)->finalize = request_start_scan_finalize;
-#line 2672 "scanner.c"
+#line 2675 "scanner.c"
 }
 
 
@@ -2684,7 +2687,7 @@ static void request_start_scan_finalize (Request* obj) {
 	_scan_job_unref0 (self->job);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
-#line 2688 "scanner.c"
+#line 2691 "scanner.c"
 }
 
 
@@ -2706,21 +2709,21 @@ RequestQuit* request_quit_construct (GType object_type) {
 	self = (RequestQuit*) request_construct (object_type);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2710 "scanner.c"
+#line 2713 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
-#line 2717 "scanner.c"
+#line 2720 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
-#line 2724 "scanner.c"
+#line 2727 "scanner.c"
 }
 
 
@@ -2746,21 +2749,21 @@ Credentials* credentials_construct (GType object_type) {
 	self = (Credentials*) g_type_create_instance (object_type);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2750 "scanner.c"
+#line 2753 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
-#line 2757 "scanner.c"
+#line 2760 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2764 "scanner.c"
+#line 2767 "scanner.c"
 }
 
 
@@ -2769,7 +2772,7 @@ static void value_credentials_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
-#line 2773 "scanner.c"
+#line 2776 "scanner.c"
 	}
 }
 
@@ -2779,11 +2782,11 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = credentials_ref (src_value->data[0].v_pointer);
-#line 2783 "scanner.c"
+#line 2786 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2787 "scanner.c"
+#line 2790 "scanner.c"
 	}
 }
 
@@ -2791,37 +2794,37 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_credentials_peek_pointer (const GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2795 "scanner.c"
+#line 2798 "scanner.c"
 }
 
 
 static gchar* value_credentials_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2802 "scanner.c"
+#line 2805 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2809 "scanner.c"
+#line 2812 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2813 "scanner.c"
+#line 2816 "scanner.c"
 		}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
-#line 2817 "scanner.c"
+#line 2820 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2821 "scanner.c"
+#line 2824 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2825 "scanner.c"
+#line 2828 "scanner.c"
 }
 
 
@@ -2832,25 +2835,25 @@ static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2836 "scanner.c"
+#line 2839 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2842 "scanner.c"
+#line 2845 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2846 "scanner.c"
+#line 2849 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
-#line 2850 "scanner.c"
+#line 2853 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2854 "scanner.c"
+#line 2857 "scanner.c"
 }
 
 
@@ -2864,7 +2867,7 @@ GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2868 "scanner.c"
+#line 2871 "scanner.c"
 }
 
 
@@ -2873,7 +2876,7 @@ gpointer value_get_credentials (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2877 "scanner.c"
+#line 2880 "scanner.c"
 }
 
 
@@ -2893,17 +2896,17 @@ void value_set_credentials (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
-#line 2897 "scanner.c"
+#line 2900 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2901 "scanner.c"
+#line 2904 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2907 "scanner.c"
+#line 2910 "scanner.c"
 	}
 }
 
@@ -2922,17 +2925,17 @@ void value_take_credentials (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2926 "scanner.c"
+#line 2929 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2930 "scanner.c"
+#line 2933 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2936 "scanner.c"
+#line 2939 "scanner.c"
 	}
 }
 
@@ -2942,14 +2945,14 @@ static void credentials_class_init (CredentialsClass * klass) {
 	credentials_parent_class = g_type_class_peek_parent (klass);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	CREDENTIALS_CLASS (klass)->finalize = credentials_finalize;
-#line 2946 "scanner.c"
+#line 2949 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2953 "scanner.c"
+#line 2956 "scanner.c"
 }
 
 
@@ -2961,7 +2964,7 @@ static void credentials_finalize (Credentials* obj) {
 	_g_free0 (self->username);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
-#line 2965 "scanner.c"
+#line 2968 "scanner.c"
 }
 
 
@@ -2986,7 +2989,7 @@ gpointer credentials_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2990 "scanner.c"
+#line 2993 "scanner.c"
 }
 
 
@@ -2999,7 +3002,7 @@ void credentials_unref (gpointer instance) {
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3003 "scanner.c"
+#line 3006 "scanner.c"
 	}
 }
 
@@ -3019,7 +3022,7 @@ GType scan_state_get_type (void) {
 static void notify_real_run (Notify* self, Scanner* scanner) {
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 3023 "scanner.c"
+#line 3026 "scanner.c"
 }
 
 
@@ -3028,7 +3031,7 @@ void notify_run (Notify* self, Scanner* scanner) {
 	g_return_if_fail (self != NULL);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
-#line 3032 "scanner.c"
+#line 3035 "scanner.c"
 }
 
 
@@ -3038,21 +3041,21 @@ Notify* notify_construct (GType object_type) {
 	self = (Notify*) g_type_create_instance (object_type);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3042 "scanner.c"
+#line 3045 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
-#line 3049 "scanner.c"
+#line 3052 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 3056 "scanner.c"
+#line 3059 "scanner.c"
 }
 
 
@@ -3061,7 +3064,7 @@ static void value_notify_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
-#line 3065 "scanner.c"
+#line 3068 "scanner.c"
 	}
 }
 
@@ -3071,11 +3074,11 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 	if (src_value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = notify_ref (src_value->data[0].v_pointer);
-#line 3075 "scanner.c"
+#line 3078 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3079 "scanner.c"
+#line 3082 "scanner.c"
 	}
 }
 
@@ -3083,37 +3086,37 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 static gpointer value_notify_peek_pointer (const GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3087 "scanner.c"
+#line 3090 "scanner.c"
 }
 
 
 static gchar* value_notify_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 3094 "scanner.c"
+#line 3097 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3101 "scanner.c"
+#line 3104 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3105 "scanner.c"
+#line 3108 "scanner.c"
 		}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
-#line 3109 "scanner.c"
+#line 3112 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3113 "scanner.c"
+#line 3116 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3117 "scanner.c"
+#line 3120 "scanner.c"
 }
 
 
@@ -3124,25 +3127,25 @@ static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_val
 	if (!object_p) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3128 "scanner.c"
+#line 3131 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 3134 "scanner.c"
+#line 3137 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3138 "scanner.c"
+#line 3141 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
-#line 3142 "scanner.c"
+#line 3145 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3146 "scanner.c"
+#line 3149 "scanner.c"
 }
 
 
@@ -3156,7 +3159,7 @@ GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 3160 "scanner.c"
+#line 3163 "scanner.c"
 }
 
 
@@ -3165,7 +3168,7 @@ gpointer value_get_notify (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3169 "scanner.c"
+#line 3172 "scanner.c"
 }
 
 
@@ -3185,17 +3188,17 @@ void value_set_notify (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
-#line 3189 "scanner.c"
+#line 3192 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3193 "scanner.c"
+#line 3196 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3199 "scanner.c"
+#line 3202 "scanner.c"
 	}
 }
 
@@ -3214,17 +3217,17 @@ void value_take_notify (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 3218 "scanner.c"
+#line 3221 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3222 "scanner.c"
+#line 3225 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3228 "scanner.c"
+#line 3231 "scanner.c"
 	}
 }
 
@@ -3236,14 +3239,14 @@ static void notify_class_init (NotifyClass * klass) {
 	NOTIFY_CLASS (klass)->finalize = notify_finalize;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_real_run;
-#line 3240 "scanner.c"
+#line 3243 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 3247 "scanner.c"
+#line 3250 "scanner.c"
 }
 
 
@@ -3251,7 +3254,7 @@ static void notify_finalize (Notify* obj) {
 	Notify * self;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
-#line 3255 "scanner.c"
+#line 3258 "scanner.c"
 }
 
 
@@ -3276,7 +3279,7 @@ gpointer notify_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 3280 "scanner.c"
+#line 3283 "scanner.c"
 }
 
 
@@ -3289,14 +3292,14 @@ void notify_unref (gpointer instance) {
 		NOTIFY_GET_CLASS (self)->finalize (self);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3293 "scanner.c"
+#line 3296 "scanner.c"
 	}
 }
 
 
 static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanningChanged * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) base;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3305,7 +3308,7 @@ static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
-#line 3309 "scanner.c"
+#line 3312 "scanner.c"
 }
 
 
@@ -3315,14 +3318,14 @@ NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	self = (NotifyScanningChanged*) notify_construct (object_type);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3319 "scanner.c"
+#line 3322 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
-#line 3326 "scanner.c"
+#line 3329 "scanner.c"
 }
 
 
@@ -3331,7 +3334,7 @@ static void notify_scanning_changed_class_init (NotifyScanningChangedClass * kla
 	notify_scanning_changed_parent_class = g_type_class_peek_parent (klass);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_scanning_changed_real_run;
-#line 3335 "scanner.c"
+#line 3338 "scanner.c"
 }
 
 
@@ -3354,7 +3357,7 @@ GType notify_scanning_changed_get_type (void) {
 static void _scan_device_unref0_ (gpointer var) {
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 3358 "scanner.c"
+#line 3361 "scanner.c"
 }
 
 
@@ -3363,13 +3366,13 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 3367 "scanner.c"
+#line 3370 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices) {
 	NotifyUpdateDevices* self = NULL;
-	GList* _tmp0_;
+	GList* _tmp0_ = NULL;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) notify_construct (object_type);
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3384,21 +3387,21 @@ NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList*
 	__g_list_free__scan_device_unref0_0 (devices);
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3388 "scanner.c"
+#line 3391 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
-#line 3395 "scanner.c"
+#line 3398 "scanner.c"
 }
 
 
 static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	NotifyUpdateDevices * self;
-	Scanner* _tmp0_;
-	GList* _tmp1_;
+	Scanner* _tmp0_ = NULL;
+	GList* _tmp1_ = NULL;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) base;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3409,7 +3412,7 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	_tmp1_ = self->priv->devices;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
-#line 3413 "scanner.c"
+#line 3416 "scanner.c"
 }
 
 
@@ -3422,14 +3425,14 @@ static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass)
 	g_type_class_add_private (klass, sizeof (NotifyUpdateDevicesPrivate));
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_update_devices_real_run;
-#line 3426 "scanner.c"
+#line 3429 "scanner.c"
 }
 
 
 static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
-#line 3433 "scanner.c"
+#line 3436 "scanner.c"
 }
 
 
@@ -3441,7 +3444,7 @@ static void notify_update_devices_finalize (Notify* obj) {
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
-#line 3445 "scanner.c"
+#line 3448 "scanner.c"
 }
 
 
@@ -3459,8 +3462,8 @@ GType notify_update_devices_get_type (void) {
 
 NotifyRequestAuthorization* notify_request_authorization_construct (GType object_type, const gchar* resource) {
 	NotifyRequestAuthorization* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (resource != NULL, NULL);
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3475,21 +3478,21 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	self->priv->resource = _tmp1_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3479 "scanner.c"
+#line 3482 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
-#line 3486 "scanner.c"
+#line 3489 "scanner.c"
 }
 
 
 static void notify_request_authorization_real_run (Notify* base, Scanner* scanner) {
 	NotifyRequestAuthorization * self;
-	Scanner* _tmp0_;
-	const gchar* _tmp1_;
+	Scanner* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) base;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3500,7 +3503,7 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	_tmp1_ = self->priv->resource;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
-#line 3504 "scanner.c"
+#line 3507 "scanner.c"
 }
 
 
@@ -3513,14 +3516,14 @@ static void notify_request_authorization_class_init (NotifyRequestAuthorizationC
 	g_type_class_add_private (klass, sizeof (NotifyRequestAuthorizationPrivate));
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_request_authorization_real_run;
-#line 3517 "scanner.c"
+#line 3520 "scanner.c"
 }
 
 
 static void notify_request_authorization_instance_init (NotifyRequestAuthorization * self) {
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
-#line 3524 "scanner.c"
+#line 3527 "scanner.c"
 }
 
 
@@ -3532,7 +3535,7 @@ static void notify_request_authorization_finalize (Notify* obj) {
 	_g_free0 (self->priv->resource);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
-#line 3536 "scanner.c"
+#line 3539 "scanner.c"
 }
 
 
@@ -3550,9 +3553,9 @@ GType notify_request_authorization_get_type (void) {
 
 NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_code, const gchar* error_string) {
 	NotifyScanFailed* self = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (error_string != NULL, NULL);
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3571,22 +3574,22 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	self->priv->error_string = _tmp2_;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3575 "scanner.c"
+#line 3578 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scan_failed_construct (TYPE_NOTIFY_SCAN_FAILED, error_code, error_string);
-#line 3582 "scanner.c"
+#line 3585 "scanner.c"
 }
 
 
 static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanFailed * self;
-	Scanner* _tmp0_;
-	gint _tmp1_;
-	const gchar* _tmp2_;
+	Scanner* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	const gchar* _tmp2_ = NULL;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) base;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3599,7 +3602,7 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	_tmp2_ = self->priv->error_string;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
-#line 3603 "scanner.c"
+#line 3606 "scanner.c"
 }
 
 
@@ -3612,14 +3615,14 @@ static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyScanFailedPrivate));
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_scan_failed_real_run;
-#line 3616 "scanner.c"
+#line 3619 "scanner.c"
 }
 
 
 static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
-#line 3623 "scanner.c"
+#line 3626 "scanner.c"
 }
 
 
@@ -3631,7 +3634,7 @@ static void notify_scan_failed_finalize (Notify* obj) {
 	_g_free0 (self->priv->error_string);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
-#line 3635 "scanner.c"
+#line 3638 "scanner.c"
 }
 
 
@@ -3649,7 +3652,7 @@ GType notify_scan_failed_get_type (void) {
 
 static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyDocumentDone * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) base;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3658,7 +3661,7 @@ static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
-#line 3662 "scanner.c"
+#line 3665 "scanner.c"
 }
 
 
@@ -3668,14 +3671,14 @@ NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	self = (NotifyDocumentDone*) notify_construct (object_type);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3672 "scanner.c"
+#line 3675 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
-#line 3679 "scanner.c"
+#line 3682 "scanner.c"
 }
 
 
@@ -3684,7 +3687,7 @@ static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
 	notify_document_done_parent_class = g_type_class_peek_parent (klass);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_document_done_real_run;
-#line 3688 "scanner.c"
+#line 3691 "scanner.c"
 }
 
 
@@ -3706,7 +3709,7 @@ GType notify_document_done_get_type (void) {
 
 static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	NotifyExpectPage * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) base;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3715,7 +3718,7 @@ static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
-#line 3719 "scanner.c"
+#line 3722 "scanner.c"
 }
 
 
@@ -3725,14 +3728,14 @@ NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	self = (NotifyExpectPage*) notify_construct (object_type);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3729 "scanner.c"
+#line 3732 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
-#line 3736 "scanner.c"
+#line 3739 "scanner.c"
 }
 
 
@@ -3741,7 +3744,7 @@ static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
 	notify_expect_page_parent_class = g_type_class_peek_parent (klass);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_expect_page_real_run;
-#line 3745 "scanner.c"
+#line 3748 "scanner.c"
 }
 
 
@@ -3764,15 +3767,15 @@ GType notify_expect_page_get_type (void) {
 static gpointer _scan_page_info_ref0 (gpointer self) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
-#line 3768 "scanner.c"
+#line 3771 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_id, ScanPageInfo* info) {
 	NotifyGotPageInfo* self = NULL;
-	gint _tmp0_;
-	ScanPageInfo* _tmp1_;
-	ScanPageInfo* _tmp2_;
+	gint _tmp0_ = 0;
+	ScanPageInfo* _tmp1_ = NULL;
+	ScanPageInfo* _tmp2_ = NULL;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (info != NULL, NULL);
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3791,24 +3794,24 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	self->priv->info = _tmp2_;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3795 "scanner.c"
+#line 3798 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_page_info_construct (TYPE_NOTIFY_GOT_PAGE_INFO, job_id, info);
-#line 3802 "scanner.c"
+#line 3805 "scanner.c"
 }
 
 
 static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	NotifyGotPageInfo * self;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	Scanner* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp7_;
+	gint _tmp1_ = 0;
+	Scanner* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gboolean _tmp7_ = FALSE;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) base;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3821,10 +3824,10 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3825 "scanner.c"
-		gint _tmp4_;
-		Scanner* _tmp5_;
-		gint _tmp6_;
+#line 3828 "scanner.c"
+		gint _tmp4_ = 0;
+		Scanner* _tmp5_ = NULL;
+		gint _tmp6_ = 0;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3833,26 +3836,26 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3837 "scanner.c"
+#line 3840 "scanner.c"
 	} else {
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3841 "scanner.c"
+#line 3844 "scanner.c"
 	}
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 3847 "scanner.c"
-		Scanner* _tmp8_;
-		ScanPageInfo* _tmp9_;
+#line 3850 "scanner.c"
+		Scanner* _tmp8_ = NULL;
+		ScanPageInfo* _tmp9_ = NULL;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->info;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "got-page-info", _tmp9_);
-#line 3856 "scanner.c"
+#line 3859 "scanner.c"
 	}
 }
 
@@ -3866,14 +3869,14 @@ static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_got_page_info_real_run;
-#line 3870 "scanner.c"
+#line 3873 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
-#line 3877 "scanner.c"
+#line 3880 "scanner.c"
 }
 
 
@@ -3885,7 +3888,7 @@ static void notify_got_page_info_finalize (Notify* obj) {
 	_scan_page_info_unref0 (self->priv->info);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
-#line 3889 "scanner.c"
+#line 3892 "scanner.c"
 }
 
 
@@ -3903,7 +3906,7 @@ GType notify_got_page_info_get_type (void) {
 
 NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	NotifyPageDone* self = NULL;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) notify_construct (object_type);
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3912,24 +3915,24 @@ NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	self->priv->job_id = _tmp0_;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3916 "scanner.c"
+#line 3919 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
-#line 3923 "scanner.c"
+#line 3926 "scanner.c"
 }
 
 
 static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyPageDone * self;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	Scanner* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp7_;
+	gint _tmp1_ = 0;
+	Scanner* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gboolean _tmp7_ = FALSE;
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) base;
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3942,10 +3945,10 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3946 "scanner.c"
-		gint _tmp4_;
-		Scanner* _tmp5_;
-		gint _tmp6_;
+#line 3949 "scanner.c"
+		gint _tmp4_ = 0;
+		Scanner* _tmp5_ = NULL;
+		gint _tmp6_ = 0;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3954,23 +3957,23 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3958 "scanner.c"
+#line 3961 "scanner.c"
 	} else {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3962 "scanner.c"
+#line 3965 "scanner.c"
 	}
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 3968 "scanner.c"
-		Scanner* _tmp8_;
+#line 3971 "scanner.c"
+		Scanner* _tmp8_ = NULL;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "page-done");
-#line 3974 "scanner.c"
+#line 3977 "scanner.c"
 	}
 }
 
@@ -3984,14 +3987,14 @@ static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_page_done_real_run;
-#line 3988 "scanner.c"
+#line 3991 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
-#line 3995 "scanner.c"
+#line 3998 "scanner.c"
 }
 
 
@@ -4001,7 +4004,7 @@ static void notify_page_done_finalize (Notify* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
-#line 4005 "scanner.c"
+#line 4008 "scanner.c"
 }
 
 
@@ -4020,15 +4023,15 @@ GType notify_page_done_get_type (void) {
 static gpointer _scan_line_ref0 (gpointer self) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
-#line 4024 "scanner.c"
+#line 4027 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLine* line) {
 	NotifyGotLine* self = NULL;
-	gint _tmp0_;
-	ScanLine* _tmp1_;
-	ScanLine* _tmp2_;
+	gint _tmp0_ = 0;
+	ScanLine* _tmp1_ = NULL;
+	ScanLine* _tmp2_ = NULL;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (line != NULL, NULL);
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4047,24 +4050,24 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	self->priv->line = _tmp2_;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4051 "scanner.c"
+#line 4054 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
-#line 4058 "scanner.c"
+#line 4061 "scanner.c"
 }
 
 
 static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	NotifyGotLine * self;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	Scanner* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp7_;
+	gint _tmp1_ = 0;
+	Scanner* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gboolean _tmp7_ = FALSE;
 #line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) base;
 #line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4077,10 +4080,10 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 4081 "scanner.c"
-		gint _tmp4_;
-		Scanner* _tmp5_;
-		gint _tmp6_;
+#line 4084 "scanner.c"
+		gint _tmp4_ = 0;
+		Scanner* _tmp5_ = NULL;
+		gint _tmp6_ = 0;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4089,26 +4092,26 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 4093 "scanner.c"
+#line 4096 "scanner.c"
 	} else {
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 4097 "scanner.c"
+#line 4100 "scanner.c"
 	}
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 4103 "scanner.c"
-		Scanner* _tmp8_;
-		ScanLine* _tmp9_;
+#line 4106 "scanner.c"
+		Scanner* _tmp8_ = NULL;
+		ScanLine* _tmp9_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->line;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "got-line", _tmp9_);
-#line 4112 "scanner.c"
+#line 4115 "scanner.c"
 	}
 }
 
@@ -4122,14 +4125,14 @@ static void notify_got_line_class_init (NotifyGotLineClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_got_line_real_run;
-#line 4126 "scanner.c"
+#line 4129 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
-#line 4133 "scanner.c"
+#line 4136 "scanner.c"
 }
 
 
@@ -4141,7 +4144,7 @@ static void notify_got_line_finalize (Notify* obj) {
 	_scan_line_unref0 (self->priv->line);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
-#line 4145 "scanner.c"
+#line 4148 "scanner.c"
 }
 
 
@@ -4160,7 +4163,7 @@ GType notify_got_line_get_type (void) {
 static void _scan_job_unref0_ (gpointer var) {
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
-#line 4164 "scanner.c"
+#line 4167 "scanner.c"
 }
 
 
@@ -4169,36 +4172,36 @@ static void _g_list_free__scan_job_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 4173 "scanner.c"
+#line 4176 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
-#line 4180 "scanner.c"
+#line 4183 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
-#line 4187 "scanner.c"
+#line 4190 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
-#line 4194 "scanner.c"
+#line 4197 "scanner.c"
 }
 
 
 static Scanner* scanner_construct (GType object_type) {
 	Scanner* self = NULL;
-	GAsyncQueue* _tmp0_;
-	GAsyncQueue* _tmp1_;
-	GAsyncQueue* _tmp2_;
+	GAsyncQueue* _tmp0_ = NULL;
+	GAsyncQueue* _tmp1_ = NULL;
+	GAsyncQueue* _tmp2_ = NULL;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Scanner*) g_type_create_instance (object_type);
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4221,42 +4224,42 @@ static Scanner* scanner_construct (GType object_type) {
 	self->priv->authorize_queue = _tmp2_;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4225 "scanner.c"
+#line 4228 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
-#line 4232 "scanner.c"
+#line 4235 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
-#line 4239 "scanner.c"
+#line 4242 "scanner.c"
 }
 
 
 Scanner* scanner_get_instance (void) {
 	Scanner* result = NULL;
-	Scanner* _tmp0_;
-	Scanner* _tmp2_;
-	Scanner* _tmp3_;
+	Scanner* _tmp0_ = NULL;
+	Scanner* _tmp2_ = NULL;
+	Scanner* _tmp3_ = NULL;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
-#line 4252 "scanner.c"
-		Scanner* _tmp1_;
+#line 4255 "scanner.c"
+		Scanner* _tmp1_ = NULL;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scanner_unref0 (scanner_scanner_object);
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
-#line 4260 "scanner.c"
+#line 4263 "scanner.c"
 	}
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
@@ -4266,15 +4269,15 @@ Scanner* scanner_get_instance (void) {
 	result = _tmp3_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4270 "scanner.c"
+#line 4273 "scanner.c"
 }
 
 
 static gboolean scanner_notify_idle_cb (Scanner* self) {
 	gboolean result = FALSE;
-	GAsyncQueue* _tmp0_;
+	Notify* notification = NULL;
+	GAsyncQueue* _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
-	Notify* notification;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4291,14 +4294,14 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	_notify_unref0 (notification);
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4295 "scanner.c"
+#line 4298 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
-#line 4302 "scanner.c"
+#line 4305 "scanner.c"
 }
 
 
@@ -4307,14 +4310,14 @@ static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	result = scanner_notify_idle_cb (self);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4311 "scanner.c"
+#line 4314 "scanner.c"
 }
 
 
 static void scanner_notify (Scanner* self, Notify* notification) {
-	GAsyncQueue* _tmp0_;
-	Notify* _tmp1_;
-	Notify* _tmp2_;
+	GAsyncQueue* _tmp0_ = NULL;
+	Notify* _tmp1_ = NULL;
+	Notify* _tmp2_ = NULL;
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4329,33 +4332,33 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	g_async_queue_push (_tmp0_, _tmp2_);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
-#line 4333 "scanner.c"
+#line 4336 "scanner.c"
 }
 
 
 static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_;
-	gboolean _tmp4_;
-	gboolean _tmp9_;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp9_ = FALSE;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
-#line 4349 "scanner.c"
-		gboolean _tmp3_;
+#line 4352 "scanner.c"
+		gboolean _tmp3_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
-#line 4355 "scanner.c"
+#line 4358 "scanner.c"
 	} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
-#line 4359 "scanner.c"
+#line 4362 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp1_;
@@ -4363,41 +4366,41 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	if (_tmp4_) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
-#line 4367 "scanner.c"
+#line 4370 "scanner.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_;
-		gboolean _tmp8_;
+		gboolean _tmp6_ = FALSE;
+		gboolean _tmp8_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp6_) {
-#line 4376 "scanner.c"
-			gboolean _tmp7_;
+#line 4379 "scanner.c"
+			gboolean _tmp7_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = _tmp7_;
-#line 4382 "scanner.c"
+#line 4385 "scanner.c"
 		} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = FALSE;
-#line 4386 "scanner.c"
+#line 4389 "scanner.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp5_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp8_;
-#line 4392 "scanner.c"
+#line 4395 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = _tmp0_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_) {
-#line 4398 "scanner.c"
-		gboolean _tmp10_;
-		NotifyScanningChanged* _tmp11_;
-		NotifyScanningChanged* _tmp12_;
+#line 4401 "scanner.c"
+		gboolean _tmp10_ = FALSE;
+		NotifyScanningChanged* _tmp11_ = NULL;
+		NotifyScanningChanged* _tmp12_ = NULL;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = is_scanning;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4410,36 +4413,36 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		scanner_notify (self, (Notify*) _tmp12_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp12_);
-#line 4414 "scanner.c"
+#line 4417 "scanner.c"
 	}
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1238 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1238 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 4435 "scanner.c"
+#line 4438 "scanner.c"
 }
 
 
 static gint scanner_get_device_weight (const gchar* device) {
 	gint result = 0;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_;
+	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 #line 307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device != NULL, 0);
@@ -4453,7 +4456,7 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 2;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4457 "scanner.c"
+#line 4460 "scanner.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
@@ -4465,33 +4468,33 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 0;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4469 "scanner.c"
+#line 4472 "scanner.c"
 	}
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4475 "scanner.c"
+#line 4478 "scanner.c"
 }
 
 
 static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	gint result = 0;
-	ScanDevice* _tmp0_;
-	const gchar* _tmp1_;
+	gint weight1 = 0;
+	ScanDevice* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-	gint weight1;
-	ScanDevice* _tmp3_;
-	const gchar* _tmp4_;
+	gint weight2 = 0;
+	ScanDevice* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-	gint weight2;
-	gint _tmp6_;
-	gint _tmp7_;
-	GCompareFunc _tmp10_;
-	ScanDevice* _tmp11_;
-	const gchar* _tmp12_;
-	ScanDevice* _tmp13_;
-	const gchar* _tmp14_;
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
+	GCompareFunc _tmp10_ = NULL;
+	ScanDevice* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	ScanDevice* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
 	gint _tmp15_ = 0;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device1 != NULL, 0);
@@ -4519,9 +4522,9 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	_tmp7_ = weight2;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
-#line 4523 "scanner.c"
-		gint _tmp8_;
-		gint _tmp9_;
+#line 4526 "scanner.c"
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = weight1;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4530,7 +4533,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 		result = _tmp8_ - _tmp9_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4534 "scanner.c"
+#line 4537 "scanner.c"
 	}
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
@@ -4548,176 +4551,176 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	result = _tmp15_;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4552 "scanner.c"
+#line 4555 "scanner.c"
 }
 
 
 static gchar* sane_status_to_string (SANE_Status status) {
 	gchar* result = NULL;
-	SANE_Status _tmp0_;
+	SANE_Status _tmp0_ = 0;
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = status;
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
-#line 4565 "scanner.c"
+#line 4568 "scanner.c"
 		{
-			gchar* _tmp1_;
+			gchar* _tmp1_ = NULL;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_STATUS_GOOD");
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4574 "scanner.c"
+#line 4577 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
-#line 4578 "scanner.c"
+#line 4581 "scanner.c"
 		{
-			gchar* _tmp2_;
+			gchar* _tmp2_ = NULL;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_STATUS_UNSUPPORTED");
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4587 "scanner.c"
+#line 4590 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
-#line 4591 "scanner.c"
+#line 4594 "scanner.c"
 		{
-			gchar* _tmp3_;
+			gchar* _tmp3_ = NULL;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_STATUS_CANCELLED");
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4600 "scanner.c"
+#line 4603 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
-#line 4604 "scanner.c"
+#line 4607 "scanner.c"
 		{
-			gchar* _tmp4_;
+			gchar* _tmp4_ = NULL;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_STATUS_DEVICE_BUSY");
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4613 "scanner.c"
+#line 4616 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
-#line 4617 "scanner.c"
+#line 4620 "scanner.c"
 		{
-			gchar* _tmp5_;
+			gchar* _tmp5_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_STATUS_INVAL");
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4626 "scanner.c"
+#line 4629 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
-#line 4630 "scanner.c"
+#line 4633 "scanner.c"
 		{
-			gchar* _tmp6_;
+			gchar* _tmp6_ = NULL;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = g_strdup ("SANE_STATUS_EOF");
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp6_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4639 "scanner.c"
+#line 4642 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
-#line 4643 "scanner.c"
+#line 4646 "scanner.c"
 		{
-			gchar* _tmp7_;
+			gchar* _tmp7_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup ("SANE_STATUS_JAMMED");
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4652 "scanner.c"
+#line 4655 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
-#line 4656 "scanner.c"
+#line 4659 "scanner.c"
 		{
-			gchar* _tmp8_;
+			gchar* _tmp8_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp8_ = g_strdup ("SANE_STATUS_NO_DOCS");
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp8_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4665 "scanner.c"
+#line 4668 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
-#line 4669 "scanner.c"
+#line 4672 "scanner.c"
 		{
-			gchar* _tmp9_;
+			gchar* _tmp9_ = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp9_ = g_strdup ("SANE_STATUS_COVER_OPEN");
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp9_;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4678 "scanner.c"
+#line 4681 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
-#line 4682 "scanner.c"
+#line 4685 "scanner.c"
 		{
-			gchar* _tmp10_;
+			gchar* _tmp10_ = NULL;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp10_ = g_strdup ("SANE_STATUS_IO_ERROR");
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp10_;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4691 "scanner.c"
+#line 4694 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
-#line 4695 "scanner.c"
+#line 4698 "scanner.c"
 		{
-			gchar* _tmp11_;
+			gchar* _tmp11_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp11_ = g_strdup ("SANE_STATUS_NO_MEM");
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp11_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4704 "scanner.c"
+#line 4707 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
-#line 4708 "scanner.c"
+#line 4711 "scanner.c"
 		{
-			gchar* _tmp12_;
+			gchar* _tmp12_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp12_ = g_strdup ("SANE_STATUS_ACCESS_DENIED");
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp12_;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4717 "scanner.c"
+#line 4720 "scanner.c"
 		}
 		default:
 		{
-			SANE_Status _tmp13_;
+			SANE_Status _tmp13_ = 0;
 			gchar* _tmp14_ = NULL;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp13_ = status;
@@ -4727,7 +4730,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp14_;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4731 "scanner.c"
+#line 4734 "scanner.c"
 		}
 	}
 }
@@ -4736,112 +4739,112 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4746 "scanner.c"
+#line 4749 "scanner.c"
 	{
-		const gchar* _tmp0_;
+		GRegex* regex = NULL;
+		const gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_;
-		GRegex* _tmp3_;
-		GRegex* _tmp4_;
-		GRegex* regex;
-		GRegex* _tmp5_;
-		const gchar* _tmp6_;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		gchar* _tmp2_ = NULL;
+		GRegex* _tmp3_ = NULL;
+		GRegex* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		GRegex* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4776 "scanner.c"
+#line 4779 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4785 "scanner.c"
+#line 4788 "scanner.c"
 		}
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp5_ = regex;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp6_ = replacement;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_replace_literal (_tmp5_, self, (gssize) (-1), 0, _tmp6_, 0, &_inner_error_);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp6_ = regex;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp7_ = replacement;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp5_ = _tmp8_;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4801 "scanner.c"
+#line 4804 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4812 "scanner.c"
+#line 4815 "scanner.c"
 		}
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		result = _tmp8_;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 4820 "scanner.c"
+#line 4823 "scanner.c"
 	}
 	goto __finally14;
 	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1247 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1246 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4834 "scanner.c"
+#line 4837 "scanner.c"
 	}
 	__finally14:
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_inner_error_ != NULL) {
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4845 "scanner.c"
+#line 4848 "scanner.c"
 	}
 }
 
@@ -4849,7 +4852,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 4853 "scanner.c"
+#line 4856 "scanner.c"
 }
 
 
@@ -4858,26 +4861,26 @@ static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpoint
 	result = scanner_compare_devices (a, b);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4862 "scanner.c"
+#line 4865 "scanner.c"
 }
 
 
 static void scanner_do_redetect (Scanner* self) {
-	SANE_Device** device_list;
-	gint device_list_length1;
-	gint _device_list_size_;
+	SANE_Device** device_list = NULL;
+	gint device_list_length1 = 0;
+	gint _device_list_size_ = 0;
+	SANE_Status status = 0;
 	SANE_Device** _tmp0_ = NULL;
 	SANE_Status _tmp1_ = 0;
-	SANE_Status status;
-	SANE_Status _tmp2_;
+	SANE_Status _tmp2_ = 0;
 	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_;
-	SANE_Status _tmp5_;
-	GList* devices;
-	GList* _tmp57_;
-	GList* _tmp64_;
-	NotifyUpdateDevices* _tmp65_;
-	NotifyUpdateDevices* _tmp66_;
+	gchar* _tmp4_ = NULL;
+	SANE_Status _tmp5_ = 0;
+	GList* devices = NULL;
+	GList* _tmp57_ = NULL;
+	GList* _tmp64_ = NULL;
+	NotifyUpdateDevices* _tmp65_ = NULL;
+	NotifyUpdateDevices* _tmp66_ = NULL;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4910,8 +4913,8 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp5_ = status;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 4914 "scanner.c"
-		SANE_Status _tmp6_;
+#line 4917 "scanner.c"
+		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
@@ -4925,90 +4928,90 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->state = SCAN_STATE_IDLE;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 4929 "scanner.c"
+#line 4932 "scanner.c"
 	}
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 4933 "scanner.c"
+#line 4936 "scanner.c"
 	{
-		gint i;
+		gint i = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 4938 "scanner.c"
+#line 4941 "scanner.c"
 		{
-			gboolean _tmp8_;
+			gboolean _tmp8_ = FALSE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 4945 "scanner.c"
-				gboolean _tmp9_;
-				SANE_Device** _tmp11_;
-				gint _tmp11__length1;
-				gint _tmp12_;
-				SANE_Device* _tmp13_;
-				SANE_Device** _tmp14_;
-				gint _tmp14__length1;
-				gint _tmp15_;
-				SANE_Device* _tmp16_;
-				const gchar* _tmp17_;
-				SANE_Device** _tmp18_;
-				gint _tmp18__length1;
-				gint _tmp19_;
-				SANE_Device* _tmp20_;
-				const gchar* _tmp21_;
-				SANE_Device** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				SANE_Device* _tmp24_;
-				const gchar* _tmp25_;
-				SANE_Device** _tmp26_;
-				gint _tmp26__length1;
-				gint _tmp27_;
-				SANE_Device* _tmp28_;
-				const gchar* _tmp29_;
-				ScanDevice* _tmp30_;
-				ScanDevice* scan_device;
-				ScanDevice* _tmp31_;
-				SANE_Device** _tmp32_;
-				gint _tmp32__length1;
-				gint _tmp33_;
-				SANE_Device* _tmp34_;
-				const gchar* _tmp35_;
-				gchar* _tmp36_;
-				SANE_Device** _tmp37_;
-				gint _tmp37__length1;
-				gint _tmp38_;
-				SANE_Device* _tmp39_;
-				const gchar* _tmp40_;
-				gchar* _tmp41_;
-				gchar* vendor;
-				const gchar* _tmp42_;
-				ScanDevice* _tmp44_;
-				const gchar* _tmp45_;
-				SANE_Device** _tmp46_;
-				gint _tmp46__length1;
-				gint _tmp47_;
-				SANE_Device* _tmp48_;
-				const gchar* _tmp49_;
+#line 4948 "scanner.c"
+				gboolean _tmp9_ = FALSE;
+				SANE_Device** _tmp11_ = NULL;
+				gint _tmp11__length1 = 0;
+				gint _tmp12_ = 0;
+				SANE_Device* _tmp13_ = NULL;
+				SANE_Device** _tmp14_ = NULL;
+				gint _tmp14__length1 = 0;
+				gint _tmp15_ = 0;
+				SANE_Device* _tmp16_ = NULL;
+				const gchar* _tmp17_ = NULL;
+				SANE_Device** _tmp18_ = NULL;
+				gint _tmp18__length1 = 0;
+				gint _tmp19_ = 0;
+				SANE_Device* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
+				SANE_Device** _tmp22_ = NULL;
+				gint _tmp22__length1 = 0;
+				gint _tmp23_ = 0;
+				SANE_Device* _tmp24_ = NULL;
+				const gchar* _tmp25_ = NULL;
+				SANE_Device** _tmp26_ = NULL;
+				gint _tmp26__length1 = 0;
+				gint _tmp27_ = 0;
+				SANE_Device* _tmp28_ = NULL;
+				const gchar* _tmp29_ = NULL;
+				ScanDevice* scan_device = NULL;
+				ScanDevice* _tmp30_ = NULL;
+				ScanDevice* _tmp31_ = NULL;
+				SANE_Device** _tmp32_ = NULL;
+				gint _tmp32__length1 = 0;
+				gint _tmp33_ = 0;
+				SANE_Device* _tmp34_ = NULL;
+				const gchar* _tmp35_ = NULL;
+				gchar* _tmp36_ = NULL;
+				gchar* vendor = NULL;
+				SANE_Device** _tmp37_ = NULL;
+				gint _tmp37__length1 = 0;
+				gint _tmp38_ = 0;
+				SANE_Device* _tmp39_ = NULL;
+				const gchar* _tmp40_ = NULL;
+				gchar* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
+				ScanDevice* _tmp44_ = NULL;
+				const gchar* _tmp45_ = NULL;
+				SANE_Device** _tmp46_ = NULL;
+				gint _tmp46__length1 = 0;
+				gint _tmp47_ = 0;
+				SANE_Device* _tmp48_ = NULL;
+				const gchar* _tmp49_ = NULL;
 				gchar* _tmp50_ = NULL;
-				ScanDevice* _tmp51_;
-				const gchar* _tmp52_;
+				ScanDevice* _tmp51_ = NULL;
+				const gchar* _tmp52_ = NULL;
 				gchar* _tmp53_ = NULL;
-				gchar* _tmp54_;
-				ScanDevice* _tmp55_;
-				ScanDevice* _tmp56_;
+				gchar* _tmp54_ = NULL;
+				ScanDevice* _tmp55_ = NULL;
+				ScanDevice* _tmp56_ = NULL;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp8_;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
-#line 5006 "scanner.c"
-					gint _tmp10_;
+#line 5009 "scanner.c"
+					gint _tmp10_ = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp10_ + 1;
-#line 5012 "scanner.c"
+#line 5015 "scanner.c"
 				}
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
@@ -5024,7 +5027,7 @@ static void scanner_do_redetect (Scanner* self) {
 				if (!(_tmp13_ != NULL)) {
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 5028 "scanner.c"
+#line 5031 "scanner.c"
 				}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = device_list;
@@ -5109,15 +5112,15 @@ static void scanner_do_redetect (Scanner* self) {
 				_tmp42_ = vendor;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp42_, "Hewlett-Packard") == 0) {
-#line 5112 "scanner.c"
-					gchar* _tmp43_;
+#line 5115 "scanner.c"
+					gchar* _tmp43_ = NULL;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp43_ = g_strdup ("HP");
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (vendor);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp43_;
-#line 5120 "scanner.c"
+#line 5123 "scanner.c"
 				}
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp44_ = scan_device;
@@ -5159,7 +5162,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_g_free0 (vendor);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
-#line 5162 "scanner.c"
+#line 5165 "scanner.c"
 			}
 		}
 	}
@@ -5173,14 +5176,14 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp57_ = devices;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp57_ != NULL) {
-#line 5176 "scanner.c"
-		GList* _tmp58_;
+#line 5179 "scanner.c"
+		ScanDevice* device = NULL;
+		GList* _tmp58_ = NULL;
 		gconstpointer _tmp59_ = NULL;
-		ScanDevice* _tmp60_;
-		ScanDevice* device;
-		ScanDevice* _tmp61_;
-		const gchar* _tmp62_;
-		gchar* _tmp63_;
+		ScanDevice* _tmp60_ = NULL;
+		ScanDevice* _tmp61_ = NULL;
+		const gchar* _tmp62_ = NULL;
+		gchar* _tmp63_ = NULL;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = devices;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5201,13 +5204,13 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->default_device = _tmp63_;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
-#line 5204 "scanner.c"
+#line 5207 "scanner.c"
 	} else {
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
-#line 5210 "scanner.c"
+#line 5213 "scanner.c"
 	}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = devices;
@@ -5223,21 +5226,21 @@ static void scanner_do_redetect (Scanner* self) {
 	_notify_unref0 (_tmp66_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 5226 "scanner.c"
+#line 5229 "scanner.c"
 }
 
 
 static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max, SANE_Option_Descriptor* option, gint value) {
 	gint result = 0;
-	gint _tmp0_;
-	gint v;
-	SANE_Option_Descriptor* _tmp1_;
-	SANE_Value_Type _tmp2_;
-	gint _tmp3_;
+	gint v = 0;
+	gint _tmp0_ = 0;
+	SANE_Option_Descriptor* _tmp1_ = NULL;
+	SANE_Value_Type _tmp2_ = 0;
+	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-	SANE_Option_Descriptor* _tmp5_;
-	SANE_Constraint_Type _tmp6_;
-	gboolean _tmp13_;
+	SANE_Option_Descriptor* _tmp5_ = NULL;
+	SANE_Constraint_Type _tmp6_ = 0;
+	gboolean _tmp13_ = FALSE;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5260,13 +5263,13 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	_tmp6_ = _tmp5_->constraint_type;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
-#line 5263 "scanner.c"
-		SANE_Option_Descriptor* _tmp7_;
-		SANE_Range* _tmp8_;
-		SANE_Word _tmp9_;
-		SANE_Option_Descriptor* _tmp10_;
-		SANE_Range* _tmp11_;
-		SANE_Word _tmp12_;
+#line 5266 "scanner.c"
+		SANE_Option_Descriptor* _tmp7_ = NULL;
+		SANE_Range* _tmp8_ = NULL;
+		SANE_Word _tmp9_ = {0};
+		SANE_Option_Descriptor* _tmp10_ = NULL;
+		SANE_Range* _tmp11_ = NULL;
+		SANE_Word _tmp12_ = {0};
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = option;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5281,43 +5284,43 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		_tmp12_ = _tmp11_->min;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
-#line 5284 "scanner.c"
+#line 5287 "scanner.c"
 	} else {
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
-#line 5288 "scanner.c"
+#line 5291 "scanner.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _tmp4_;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
-#line 5294 "scanner.c"
-		gint _tmp14_;
-		gint _tmp15_;
-		gint _tmp16_;
-		SANE_Option_Descriptor* _tmp17_;
-		SANE_Range* _tmp18_;
-		SANE_Word _tmp19_;
-		SANE_Option_Descriptor* _tmp20_;
-		SANE_Range* _tmp21_;
-		SANE_Word _tmp22_;
-		gint _tmp23_;
-		gint _tmp24_;
-		gint _tmp25_;
-		gint _tmp26_;
-		SANE_Option_Descriptor* _tmp27_;
-		SANE_Range* _tmp28_;
-		SANE_Word _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
-		gint _tmp32_;
-		gint _tmp33_;
-		SANE_Option_Descriptor* _tmp34_;
-		SANE_Range* _tmp35_;
-		SANE_Word _tmp36_;
-		SANE_Option_Descriptor* _tmp37_;
-		SANE_Range* _tmp38_;
-		SANE_Word _tmp39_;
+#line 5297 "scanner.c"
+		gint _tmp14_ = 0;
+		gint _tmp15_ = 0;
+		gint _tmp16_ = 0;
+		SANE_Option_Descriptor* _tmp17_ = NULL;
+		SANE_Range* _tmp18_ = NULL;
+		SANE_Word _tmp19_ = {0};
+		SANE_Option_Descriptor* _tmp20_ = NULL;
+		SANE_Range* _tmp21_ = NULL;
+		SANE_Word _tmp22_ = {0};
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		gint _tmp25_ = 0;
+		gint _tmp26_ = 0;
+		SANE_Option_Descriptor* _tmp27_ = NULL;
+		SANE_Range* _tmp28_ = NULL;
+		SANE_Word _tmp29_ = {0};
+		gint _tmp30_ = 0;
+		gint _tmp31_ = 0;
+		gint _tmp32_ = 0;
+		gint _tmp33_ = 0;
+		SANE_Option_Descriptor* _tmp34_ = NULL;
+		SANE_Range* _tmp35_ = NULL;
+		SANE_Word _tmp36_ = {0};
+		SANE_Option_Descriptor* _tmp37_ = NULL;
+		SANE_Range* _tmp38_ = NULL;
+		SANE_Word _tmp39_ = {0};
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = v;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5381,30 +5384,30 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
 " %d, max: %d]", _tmp30_, _tmp31_, _tmp32_, _tmp33_, (gint) _tmp36_, (gint) _tmp39_);
-#line 5383 "scanner.c"
+#line 5386 "scanner.c"
 	}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5389 "scanner.c"
+#line 5392 "scanner.c"
 }
 
 
 static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index) {
 	gboolean result = FALSE;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Int _tmp1_;
-	SANE_Handle _tmp2_;
-	SANE_Int _tmp3_;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Int _tmp1_ = {0};
+	SANE_Status status = 0;
+	SANE_Handle _tmp2_ = {0};
+	SANE_Int _tmp3_ = {0};
 	SANE_Status _tmp4_ = 0;
-	SANE_Status status;
-	SANE_Int _tmp5_;
-	SANE_Status _tmp6_;
+	SANE_Int _tmp5_ = {0};
+	SANE_Status _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	SANE_Status _tmp9_;
-	SANE_Status _tmp14_;
+	gchar* _tmp8_ = NULL;
+	SANE_Status _tmp9_ = 0;
+	SANE_Status _tmp14_ = 0;
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5419,7 +5422,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		result = FALSE;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 5421 "scanner.c"
+#line 5424 "scanner.c"
 	}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -5445,10 +5448,10 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	_tmp9_ = status;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
-#line 5447 "scanner.c"
-		SANE_Option_Descriptor* _tmp10_;
-		const gchar* _tmp11_;
-		SANE_Status _tmp12_;
+#line 5450 "scanner.c"
+		SANE_Option_Descriptor* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		SANE_Status _tmp12_ = 0;
 		const gchar* _tmp13_ = NULL;
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
@@ -5460,7 +5463,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		_tmp13_ = sane_strstatus (_tmp12_);
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
-#line 5462 "scanner.c"
+#line 5465 "scanner.c"
 	}
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
@@ -5468,31 +5471,31 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	result = _tmp14_ == SANE_STATUS_GOOD;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5470 "scanner.c"
+#line 5473 "scanner.c"
 }
 
 
 static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gboolean value, gboolean* _result_) {
 	gboolean _vala_result = FALSE;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Value_Type _tmp1_;
-	gboolean _tmp2_;
-	SANE_Bool v;
-	SANE_Handle _tmp3_;
-	SANE_Int _tmp4_;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+	SANE_Bool v = {0};
+	gboolean _tmp2_ = FALSE;
+	SANE_Status status = 0;
+	SANE_Handle _tmp3_ = {0};
+	SANE_Int _tmp4_ = {0};
 	SANE_Status _tmp5_ = 0;
-	SANE_Status status;
-	SANE_Bool _tmp6_;
+	SANE_Bool _tmp6_ = {0};
 	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_;
+	gboolean _tmp8_ = FALSE;
 	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_;
-	SANE_Int _tmp11_;
-	const gchar* _tmp12_;
-	SANE_Status _tmp13_;
+	gboolean _tmp10_ = FALSE;
+	SANE_Int _tmp11_ = {0};
+	const gchar* _tmp12_ = NULL;
+	SANE_Status _tmp13_ = 0;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_;
-	const gchar* _tmp16_;
+	gchar* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5525,11 +5528,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp8_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
-#line 5527 "scanner.c"
+#line 5530 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
-#line 5531 "scanner.c"
+#line 5534 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
@@ -5537,11 +5540,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp10_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
-#line 5539 "scanner.c"
+#line 5542 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
-#line 5543 "scanner.c"
+#line 5546 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
@@ -5564,29 +5567,29 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_result_) {
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5565 "scanner.c"
+#line 5568 "scanner.c"
 	}
 }
 
 
 static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gint value, gint* _result_) {
 	gint _vala_result = 0;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Value_Type _tmp1_;
-	gint _tmp2_;
-	SANE_Int v;
-	SANE_Option_Descriptor* _tmp3_;
-	SANE_Constraint_Type _tmp4_;
-	SANE_Handle _tmp49_;
-	SANE_Int _tmp50_;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+	SANE_Int v = {0};
+	gint _tmp2_ = 0;
+	SANE_Option_Descriptor* _tmp3_ = NULL;
+	SANE_Constraint_Type _tmp4_ = 0;
+	SANE_Status status = 0;
+	SANE_Handle _tmp49_ = {0};
+	SANE_Int _tmp50_ = {0};
 	SANE_Status _tmp51_ = 0;
-	SANE_Status status;
-	SANE_Int _tmp52_;
-	gint _tmp53_;
+	SANE_Int _tmp52_ = {0};
+	gint _tmp53_ = 0;
 	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_;
-	SANE_Int _tmp56_;
-	SANE_Int _tmp57_;
+	gchar* _tmp55_ = NULL;
+	SANE_Int _tmp56_ = {0};
+	SANE_Int _tmp57_ = {0};
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5607,18 +5610,18 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	_tmp4_ = _tmp3_->constraint_type;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5608 "scanner.c"
-		SANE_Option_Descriptor* _tmp5_;
-		SANE_Range* _tmp6_;
-		SANE_Word _tmp7_;
-		SANE_Int _tmp12_;
-		SANE_Option_Descriptor* _tmp13_;
-		SANE_Range* _tmp14_;
-		SANE_Word _tmp15_;
-		SANE_Int _tmp19_;
-		SANE_Option_Descriptor* _tmp20_;
-		SANE_Range* _tmp21_;
-		SANE_Word _tmp22_;
+#line 5611 "scanner.c"
+		SANE_Option_Descriptor* _tmp5_ = NULL;
+		SANE_Range* _tmp6_ = NULL;
+		SANE_Word _tmp7_ = {0};
+		SANE_Int _tmp12_ = {0};
+		SANE_Option_Descriptor* _tmp13_ = NULL;
+		SANE_Range* _tmp14_ = NULL;
+		SANE_Word _tmp15_ = {0};
+		SANE_Int _tmp19_ = {0};
+		SANE_Option_Descriptor* _tmp20_ = NULL;
+		SANE_Range* _tmp21_ = NULL;
+		SANE_Word _tmp22_ = {0};
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5627,11 +5630,11 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp7_ = _tmp6_->quant;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
-#line 5628 "scanner.c"
-			SANE_Int _tmp8_;
-			SANE_Option_Descriptor* _tmp9_;
-			SANE_Range* _tmp10_;
-			SANE_Word _tmp11_;
+#line 5631 "scanner.c"
+			SANE_Int _tmp8_ = {0};
+			SANE_Option_Descriptor* _tmp9_ = NULL;
+			SANE_Range* _tmp10_ = NULL;
+			SANE_Word _tmp11_ = {0};
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = v;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5642,7 +5645,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp11_ = _tmp10_->quant;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
-#line 5643 "scanner.c"
+#line 5646 "scanner.c"
 		}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
@@ -5654,10 +5657,10 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp15_ = _tmp14_->min;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
-#line 5655 "scanner.c"
-			SANE_Option_Descriptor* _tmp16_;
-			SANE_Range* _tmp17_;
-			SANE_Word _tmp18_;
+#line 5658 "scanner.c"
+			SANE_Option_Descriptor* _tmp16_ = NULL;
+			SANE_Range* _tmp17_ = NULL;
+			SANE_Word _tmp18_ = {0};
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = option;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5666,7 +5669,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp18_ = _tmp17_->min;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
-#line 5667 "scanner.c"
+#line 5670 "scanner.c"
 		}
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
@@ -5678,10 +5681,10 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp22_ = _tmp21_->max;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
-#line 5679 "scanner.c"
-			SANE_Option_Descriptor* _tmp23_;
-			SANE_Range* _tmp24_;
-			SANE_Word _tmp25_;
+#line 5682 "scanner.c"
+			SANE_Option_Descriptor* _tmp23_ = NULL;
+			SANE_Range* _tmp24_ = NULL;
+			SANE_Word _tmp25_ = {0};
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = option;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5690,71 +5693,71 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp25_ = _tmp24_->max;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
-#line 5691 "scanner.c"
+#line 5694 "scanner.c"
 		}
 	} else {
-		SANE_Option_Descriptor* _tmp26_;
-		SANE_Constraint_Type _tmp27_;
+		SANE_Option_Descriptor* _tmp26_ = NULL;
+		SANE_Constraint_Type _tmp27_ = 0;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint_type;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5702 "scanner.c"
-			gint _tmp28_;
-			gint distance;
-			gint nearest;
-			gint _tmp48_;
+#line 5705 "scanner.c"
+			gint distance = 0;
+			gint _tmp28_ = 0;
+			gint nearest = 0;
+			gint _tmp48_ = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = G_MAXINT;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = _tmp28_;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
-#line 5713 "scanner.c"
+#line 5716 "scanner.c"
 			{
-				gint i;
+				gint i = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5718 "scanner.c"
+#line 5721 "scanner.c"
 				{
-					gboolean _tmp29_;
+					gboolean _tmp29_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = TRUE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5725 "scanner.c"
-						gboolean _tmp30_;
-						gint _tmp32_;
-						SANE_Option_Descriptor* _tmp33_;
-						SANE_Word* _tmp34_;
-						gint _tmp34__length1;
-						SANE_Word _tmp35_;
-						SANE_Option_Descriptor* _tmp36_;
-						SANE_Word* _tmp37_;
-						gint _tmp37__length1;
-						gint _tmp38_;
-						SANE_Word _tmp39_;
-						gint x;
-						gint _tmp40_;
-						SANE_Int _tmp41_;
-						gint d;
-						gint _tmp42_;
+#line 5728 "scanner.c"
+						gboolean _tmp30_ = FALSE;
+						gint _tmp32_ = 0;
+						SANE_Option_Descriptor* _tmp33_ = NULL;
+						SANE_Word* _tmp34_ = NULL;
+						gint _tmp34__length1 = 0;
+						SANE_Word _tmp35_ = {0};
+						gint x = 0;
+						SANE_Option_Descriptor* _tmp36_ = NULL;
+						SANE_Word* _tmp37_ = NULL;
+						gint _tmp37__length1 = 0;
+						gint _tmp38_ = 0;
+						SANE_Word _tmp39_ = {0};
+						gint d = 0;
+						gint _tmp40_ = 0;
+						SANE_Int _tmp41_ = {0};
+						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
-						gint _tmp44_;
-						gint _tmp45_;
+						gint _tmp44_ = 0;
+						gint _tmp45_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = _tmp29_;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp30_) {
-#line 5749 "scanner.c"
-							gint _tmp31_;
+#line 5752 "scanner.c"
+							gint _tmp31_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp31_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp31_ + 1;
-#line 5755 "scanner.c"
+#line 5758 "scanner.c"
 						}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = FALSE;
@@ -5772,7 +5775,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						if (!(((SANE_Word) _tmp32_) < _tmp35_)) {
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 5773 "scanner.c"
+#line 5776 "scanner.c"
 						}
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp36_ = option;
@@ -5804,9 +5807,9 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						_tmp45_ = distance;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp44_ < _tmp45_) {
-#line 5805 "scanner.c"
-							gint _tmp46_;
-							gint _tmp47_;
+#line 5808 "scanner.c"
+							gint _tmp46_ = 0;
+							gint _tmp47_ = 0;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp46_ = d;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5815,7 +5818,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 							_tmp47_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp47_;
-#line 5816 "scanner.c"
+#line 5819 "scanner.c"
 						}
 					}
 				}
@@ -5824,7 +5827,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp48_ = nearest;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp48_;
-#line 5825 "scanner.c"
+#line 5828 "scanner.c"
 		}
 	}
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5858,30 +5861,30 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	if (_result_) {
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5858 "scanner.c"
+#line 5861 "scanner.c"
 	}
 }
 
 
 static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_) {
 	gdouble _vala_result = 0.0;
-	gdouble _tmp0_;
-	gdouble v;
+	gdouble v = 0.0;
+	gdouble _tmp0_ = 0.0;
 	SANE_Fixed v_fixed = {0};
-	SANE_Option_Descriptor* _tmp1_;
-	SANE_Value_Type _tmp2_;
-	SANE_Option_Descriptor* _tmp3_;
-	SANE_Constraint_Type _tmp4_;
-	gdouble _tmp43_;
+	SANE_Option_Descriptor* _tmp1_ = NULL;
+	SANE_Value_Type _tmp2_ = 0;
+	SANE_Option_Descriptor* _tmp3_ = NULL;
+	SANE_Constraint_Type _tmp4_ = 0;
+	gdouble _tmp43_ = 0.0;
 	SANE_Fixed _tmp44_ = {0};
-	SANE_Handle _tmp45_;
-	SANE_Int _tmp46_;
+	SANE_Status status = 0;
+	SANE_Handle _tmp45_ = {0};
+	SANE_Int _tmp46_ = {0};
 	SANE_Status _tmp47_ = 0;
-	SANE_Status status;
-	SANE_Int _tmp48_;
-	gdouble _tmp49_;
+	SANE_Int _tmp48_ = {0};
+	gdouble _tmp49_ = 0.0;
 	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_;
+	gchar* _tmp51_ = NULL;
 	gdouble _tmp52_ = 0.0;
 	gdouble _tmp53_ = 0.0;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5904,21 +5907,21 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	_tmp4_ = _tmp3_->constraint_type;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5904 "scanner.c"
-		SANE_Option_Descriptor* _tmp5_;
-		SANE_Range* _tmp6_;
-		SANE_Word _tmp7_;
+#line 5907 "scanner.c"
+		gdouble min = 0.0;
+		SANE_Option_Descriptor* _tmp5_ = NULL;
+		SANE_Range* _tmp6_ = NULL;
+		SANE_Word _tmp7_ = {0};
 		gdouble _tmp8_ = 0.0;
-		gdouble min;
-		SANE_Option_Descriptor* _tmp9_;
-		SANE_Range* _tmp10_;
-		SANE_Word _tmp11_;
+		gdouble max = 0.0;
+		SANE_Option_Descriptor* _tmp9_ = NULL;
+		SANE_Range* _tmp10_ = NULL;
+		SANE_Word _tmp11_ = {0};
 		gdouble _tmp12_ = 0.0;
-		gdouble max;
-		gdouble _tmp13_;
-		gdouble _tmp14_;
-		gdouble _tmp16_;
-		gdouble _tmp17_;
+		gdouble _tmp13_ = 0.0;
+		gdouble _tmp14_ = 0.0;
+		gdouble _tmp16_ = 0.0;
+		gdouble _tmp17_ = 0.0;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5945,13 +5948,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp14_ = min;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
-#line 5945 "scanner.c"
-			gdouble _tmp15_;
+#line 5948 "scanner.c"
+			gdouble _tmp15_ = 0.0;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
-#line 5951 "scanner.c"
+#line 5954 "scanner.c"
 		}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
@@ -5959,75 +5962,75 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp17_ = max;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
-#line 5959 "scanner.c"
-			gdouble _tmp18_;
+#line 5962 "scanner.c"
+			gdouble _tmp18_ = 0.0;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
-#line 5965 "scanner.c"
+#line 5968 "scanner.c"
 		}
 	} else {
-		SANE_Option_Descriptor* _tmp19_;
-		SANE_Constraint_Type _tmp20_;
+		SANE_Option_Descriptor* _tmp19_ = NULL;
+		SANE_Constraint_Type _tmp20_ = 0;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint_type;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5976 "scanner.c"
-			gdouble _tmp21_;
-			gdouble distance;
-			gdouble nearest;
-			gdouble _tmp42_;
+#line 5979 "scanner.c"
+			gdouble distance = 0.0;
+			gdouble _tmp21_ = 0.0;
+			gdouble nearest = 0.0;
+			gdouble _tmp42_ = 0.0;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = DBL_MAX;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = _tmp21_;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
-#line 5987 "scanner.c"
+#line 5990 "scanner.c"
 			{
-				gint i;
+				gint i = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5992 "scanner.c"
+#line 5995 "scanner.c"
 				{
-					gboolean _tmp22_;
+					gboolean _tmp22_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp22_ = TRUE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5999 "scanner.c"
-						gboolean _tmp23_;
-						gint _tmp25_;
-						SANE_Option_Descriptor* _tmp26_;
-						SANE_Word* _tmp27_;
-						gint _tmp27__length1;
-						SANE_Word _tmp28_;
-						SANE_Option_Descriptor* _tmp29_;
-						SANE_Word* _tmp30_;
-						gint _tmp30__length1;
-						gint _tmp31_;
-						SANE_Word _tmp32_;
+#line 6002 "scanner.c"
+						gboolean _tmp23_ = FALSE;
+						gint _tmp25_ = 0;
+						SANE_Option_Descriptor* _tmp26_ = NULL;
+						SANE_Word* _tmp27_ = NULL;
+						gint _tmp27__length1 = 0;
+						SANE_Word _tmp28_ = {0};
+						gdouble x = 0.0;
+						SANE_Option_Descriptor* _tmp29_ = NULL;
+						SANE_Word* _tmp30_ = NULL;
+						gint _tmp30__length1 = 0;
+						gint _tmp31_ = 0;
+						SANE_Word _tmp32_ = {0};
 						gdouble _tmp33_ = 0.0;
-						gdouble x;
-						gdouble _tmp34_;
-						gdouble _tmp35_;
+						gdouble _tmp34_ = 0.0;
+						gdouble _tmp35_ = 0.0;
 						gdouble _tmp36_ = 0.0;
-						gdouble _tmp37_;
+						gdouble _tmp37_ = 0.0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = _tmp22_;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp23_) {
-#line 6021 "scanner.c"
-							gint _tmp24_;
+#line 6024 "scanner.c"
+							gint _tmp24_ = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp24_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp24_ + 1;
-#line 6027 "scanner.c"
+#line 6030 "scanner.c"
 						}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = FALSE;
@@ -6045,7 +6048,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						if (!(((SANE_Word) _tmp25_) < _tmp28_)) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6045 "scanner.c"
+#line 6048 "scanner.c"
 						}
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = option;
@@ -6071,11 +6074,11 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						_tmp37_ = distance;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp36_ < _tmp37_) {
-#line 6071 "scanner.c"
-							gdouble _tmp38_;
-							gdouble _tmp39_;
+#line 6074 "scanner.c"
+							gdouble _tmp38_ = 0.0;
+							gdouble _tmp39_ = 0.0;
 							gdouble _tmp40_ = 0.0;
-							gdouble _tmp41_;
+							gdouble _tmp41_ = 0.0;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp38_ = x;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6088,7 +6091,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 							_tmp41_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp41_;
-#line 6088 "scanner.c"
+#line 6091 "scanner.c"
 						}
 					}
 				}
@@ -6097,7 +6100,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 			_tmp42_ = nearest;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp42_;
-#line 6097 "scanner.c"
+#line 6100 "scanner.c"
 		}
 	}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6137,4539 +6140,4659 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	if (_result_) {
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6136 "scanner.c"
+#line 6139 "scanner.c"
+	}
+}
+
+
+static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_) {
+	gdouble _vala_result = 0.0;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (self != NULL);
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (option != NULL);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = option;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = _tmp0_->type;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp1_ == SANE_TYPE_FIXED) {
+#line 6158 "scanner.c"
+		SANE_Handle _tmp2_ = {0};
+		SANE_Option_Descriptor* _tmp3_ = NULL;
+		SANE_Int _tmp4_ = {0};
+		gdouble _tmp5_ = 0.0;
+		gdouble _tmp6_ = 0.0;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp2_ = handle;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp3_ = option;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp4_ = option_index;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp5_ = value;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_vala_result = _tmp6_;
+#line 6176 "scanner.c"
+	} else {
+		SANE_Option_Descriptor* _tmp7_ = NULL;
+		SANE_Value_Type _tmp8_ = 0;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp7_ = option;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp8_ = _tmp7_->type;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp8_ == SANE_TYPE_INT) {
+#line 6186 "scanner.c"
+			gint r = 0;
+			SANE_Handle _tmp9_ = {0};
+			SANE_Option_Descriptor* _tmp10_ = NULL;
+			SANE_Int _tmp11_ = {0};
+			gdouble _tmp12_ = 0.0;
+			gdouble _tmp13_ = 0.0;
+			gint _tmp14_ = 0;
+			gint _tmp15_ = 0;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp9_ = handle;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp10_ = option;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp11_ = option_index;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp12_ = value;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp13_ = round (_tmp12_);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_int_option (self, _tmp9_, _tmp10_, _tmp11_, (gint) _tmp13_, &_tmp14_);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			r = _tmp14_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp15_ = r;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_vala_result = (gdouble) _tmp15_;
+#line 6213 "scanner.c"
+		} else {
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_vala_result = 0.0;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:520: Unable to set unsupported option type");
+#line 6219 "scanner.c"
+		}
+	}
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_result_) {
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		*_result_ = _vala_result;
+#line 6226 "scanner.c"
 	}
 }
 
 
+static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index) {
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Constraint_Type _tmp1_ = 0;
+	SANE_Status status = 0;
+	SANE_Handle _tmp2_ = {0};
+	SANE_Int _tmp3_ = {0};
+	SANE_Option_Descriptor* _tmp4_ = NULL;
+	SANE_Range* _tmp5_ = NULL;
+	SANE_Status _tmp6_ = 0;
+	SANE_Int _tmp7_ = {0};
+	SANE_Status _tmp8_ = 0;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (self != NULL);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (option != NULL);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = option;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = _tmp0_->constraint_type;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		return;
+#line 6256 "scanner.c"
+	}
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp2_ = handle;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp3_ = option_index;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp4_ = option;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp5_ = _tmp4_->constraint.range;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp6_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_VALUE, &_tmp5_->max, NULL);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp6_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp7_ = option_index;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp8_ = status;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp9_ = sane_status_to_string (_tmp8_);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp10_ = _tmp9_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:530: sane_control_option (%d, SANE_ACTION_SET_VALUE, opti" \
+"on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_g_free0 (_tmp10_);
+#line 6282 "scanner.c"
+}
+
+
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
-#line 965 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	glong _tmp0_ = 0L;
+	gchar _tmp1_ = '\0';
+#line 965 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 6155 "scanner.c"
+#line 6300 "scanner.c"
 }
 
 
 static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, const gchar* value, gchar** _result_) {
 	gchar* _vala_result = NULL;
 	gboolean result = FALSE;
-	gchar* _tmp0_;
-	SANE_Option_Descriptor* _tmp1_;
-	SANE_Value_Type _tmp2_;
-	SANE_Option_Descriptor* _tmp3_;
-	SANE_Int _tmp4_;
+	gchar* _tmp0_ = NULL;
+	SANE_Option_Descriptor* _tmp1_ = NULL;
+	SANE_Value_Type _tmp2_ = 0;
+	gchar* s = NULL;
+	SANE_Option_Descriptor* _tmp3_ = NULL;
+	SANE_Int _tmp4_ = {0};
 	gchar* _tmp5_ = NULL;
-	gchar* s;
-	gint s_length1;
-	gint _s_size_;
-	gint i;
-	gchar* _tmp23_;
-	gint _tmp23__length1;
-	gint _tmp24_;
-	gchar _tmp25_;
-	SANE_Handle _tmp26_;
-	SANE_Int _tmp27_;
-	gchar* _tmp28_;
-	gint _tmp28__length1;
+	gint s_length1 = 0;
+	gint _s_size_ = 0;
+	gint i = 0;
+	gchar* _tmp23_ = NULL;
+	gint _tmp23__length1 = 0;
+	gint _tmp24_ = 0;
+	gchar _tmp25_ = '\0';
+	SANE_Status status = 0;
+	SANE_Handle _tmp26_ = {0};
+	SANE_Int _tmp27_ = {0};
+	gchar* _tmp28_ = NULL;
+	gint _tmp28__length1 = 0;
 	SANE_Status _tmp29_ = 0;
-	SANE_Status status;
-	gchar* _tmp30_;
-	gint _tmp30__length1;
-	gchar* _tmp31_;
-	SANE_Int _tmp32_;
-	const gchar* _tmp33_;
+	gchar* _tmp30_ = NULL;
+	gint _tmp30__length1 = 0;
+	gchar* _tmp31_ = NULL;
+	SANE_Int _tmp32_ = {0};
+	const gchar* _tmp33_ = NULL;
 	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_;
-	const gchar* _tmp36_;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (value != NULL, FALSE);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_strdup ("");
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp0_;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_STRING, FALSE);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->size;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = g_new0 (gchar, _tmp4_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp5_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s_length1 = _tmp4_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_s_size_ = s_length1;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
-#line 6222 "scanner.c"
+#line 6367 "scanner.c"
 	{
-		gboolean _tmp6_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gboolean _tmp6_ = FALSE;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
-#line 6229 "scanner.c"
-			gboolean _tmp7_;
+#line 6374 "scanner.c"
+			gboolean _tmp7_ = FALSE;
 			gboolean _tmp9_ = FALSE;
-			gint _tmp10_;
-			SANE_Option_Descriptor* _tmp11_;
-			SANE_Int _tmp12_;
-			gboolean _tmp16_;
-			gchar* _tmp17_;
-			gint _tmp17__length1;
-			gint _tmp18_;
-			const gchar* _tmp19_;
-			gint _tmp20_;
+			gint _tmp10_ = 0;
+			SANE_Option_Descriptor* _tmp11_ = NULL;
+			SANE_Int _tmp12_ = {0};
+			gboolean _tmp16_ = FALSE;
+			gchar* _tmp17_ = NULL;
+			gint _tmp17__length1 = 0;
+			gint _tmp18_ = 0;
+			const gchar* _tmp19_ = NULL;
+			gint _tmp20_ = 0;
 			gchar _tmp21_ = '\0';
-			gchar _tmp22_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar _tmp22_ = '\0';
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = _tmp6_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp7_) {
-#line 6247 "scanner.c"
-				gint _tmp8_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6392 "scanner.c"
+				gint _tmp8_ = 0;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = i;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp8_ + 1;
-#line 6253 "scanner.c"
+#line 6398 "scanner.c"
 			}
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = i;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = option;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = _tmp11_->size;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp10_) < (_tmp12_ - 1)) {
-#line 6265 "scanner.c"
-				const gchar* _tmp13_;
-				gint _tmp14_;
+#line 6410 "scanner.c"
+				const gchar* _tmp13_ = NULL;
+				gint _tmp14_ = 0;
 				gchar _tmp15_ = '\0';
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = value;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = i;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp15_ = string_get (_tmp13_, (glong) _tmp14_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp15_ != '\0';
-#line 6277 "scanner.c"
+#line 6422 "scanner.c"
 			} else {
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = FALSE;
-#line 6281 "scanner.c"
+#line 6426 "scanner.c"
 			}
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = _tmp9_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp16_) {
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 6289 "scanner.c"
+#line 6434 "scanner.c"
 			}
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = s;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17__length1 = s_length1;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = i;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = value;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = i;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_[_tmp18_] = _tmp21_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = _tmp17_[_tmp18_];
-#line 6307 "scanner.c"
+#line 6452 "scanner.c"
 		}
 	}
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = s;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23__length1 = s_length1;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = i;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_[_tmp24_] = '\0';
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = _tmp23_[_tmp24_];
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = handle;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = option_index;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = s;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28__length1 = s_length1;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = sane_control_option (_tmp26_, _tmp27_, SANE_ACTION_SET_VALUE, _tmp28_, NULL);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp29_;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = s;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30__length1 = s_length1;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = g_strdup ((const gchar*) _tmp30_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp31_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = option_index;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = value;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = sane_status_to_string (status);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _vala_result;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:520: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:546: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
 "\") -> (%s, \"%s\")", (gint) _tmp32_, _tmp33_, _tmp35_, _tmp36_);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp35_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = status == SANE_STATUS_GOOD;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = (g_free (s), NULL);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6364 "scanner.c"
+#line 6509 "scanner.c"
 	} else {
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6368 "scanner.c"
+#line 6513 "scanner.c"
 	}
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6372 "scanner.c"
+#line 6517 "scanner.c"
 }
 
 
 static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gchar** values, int values_length1, gchar** _result_) {
 	gchar* _vala_result = NULL;
 	gboolean result = FALSE;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Value_Type _tmp1_;
-	SANE_Option_Descriptor* _tmp2_;
-	SANE_Constraint_Type _tmp3_;
-	gchar* _tmp36_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+	SANE_Option_Descriptor* _tmp2_ = NULL;
+	SANE_Constraint_Type _tmp3_ = 0;
+	gchar* _tmp36_ = NULL;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp1_ == SANE_TYPE_STRING, FALSE);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->constraint_type;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6400 "scanner.c"
+#line 6545 "scanner.c"
 	{
-		gint i;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gint i = 0;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 6405 "scanner.c"
+#line 6550 "scanner.c"
 		{
-			gboolean _tmp4_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gboolean _tmp4_ = FALSE;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 6412 "scanner.c"
-				gboolean _tmp5_;
-				gchar** _tmp7_;
-				gint _tmp7__length1;
-				gint _tmp8_;
-				const gchar* _tmp9_;
-				gint j;
-				SANE_Option_Descriptor* _tmp24_;
-				gchar** _tmp25_;
-				gint _tmp25__length1;
-				gint _tmp26_;
-				const gchar* _tmp27_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6557 "scanner.c"
+				gboolean _tmp5_ = FALSE;
+				gchar** _tmp7_ = NULL;
+				gint _tmp7__length1 = 0;
+				gint _tmp8_ = 0;
+				const gchar* _tmp9_ = NULL;
+				gint j = 0;
+				SANE_Option_Descriptor* _tmp24_ = NULL;
+				gchar** _tmp25_ = NULL;
+				gint _tmp25__length1 = 0;
+				gint _tmp26_ = 0;
+				const gchar* _tmp27_ = NULL;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp5_ = _tmp4_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp5_) {
-#line 6428 "scanner.c"
-					gint _tmp6_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6573 "scanner.c"
+					gint _tmp6_ = 0;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp6_ = i;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp6_ + 1;
-#line 6434 "scanner.c"
+#line 6579 "scanner.c"
 				}
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = values;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7__length1 = values_length1;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = i;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp7_[_tmp8_];
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp9_ != NULL)) {
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 6450 "scanner.c"
+#line 6595 "scanner.c"
 				}
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
-#line 6454 "scanner.c"
+#line 6599 "scanner.c"
 				{
-					gboolean _tmp10_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp10_ = FALSE;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = TRUE;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6461 "scanner.c"
-						gboolean _tmp11_;
-						SANE_Option_Descriptor* _tmp13_;
-						gchar** _tmp14_;
-						gint _tmp14__length1;
-						gint _tmp15_;
-						const gchar* _tmp16_;
-						gchar** _tmp17_;
-						gint _tmp17__length1;
-						gint _tmp18_;
-						const gchar* _tmp19_;
-						SANE_Option_Descriptor* _tmp20_;
-						gchar** _tmp21_;
-						gint _tmp21__length1;
-						gint _tmp22_;
-						const gchar* _tmp23_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6606 "scanner.c"
+						gboolean _tmp11_ = FALSE;
+						SANE_Option_Descriptor* _tmp13_ = NULL;
+						gchar** _tmp14_ = NULL;
+						gint _tmp14__length1 = 0;
+						gint _tmp15_ = 0;
+						const gchar* _tmp16_ = NULL;
+						gchar** _tmp17_ = NULL;
+						gint _tmp17__length1 = 0;
+						gint _tmp18_ = 0;
+						const gchar* _tmp19_ = NULL;
+						SANE_Option_Descriptor* _tmp20_ = NULL;
+						gchar** _tmp21_ = NULL;
+						gint _tmp21__length1 = 0;
+						gint _tmp22_ = 0;
+						const gchar* _tmp23_ = NULL;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp11_ = _tmp10_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp11_) {
-#line 6481 "scanner.c"
-							gint _tmp12_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6626 "scanner.c"
+							gint _tmp12_ = 0;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp12_ = j;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp12_ + 1;
-#line 6487 "scanner.c"
+#line 6632 "scanner.c"
 						}
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp10_ = FALSE;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp13_ = option;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14_ = _tmp13_->constraint.string_list;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14__length1 = -1;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = j;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp16_ = _tmp14_[_tmp15_];
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp16_ != NULL)) {
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6505 "scanner.c"
+#line 6650 "scanner.c"
 						}
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17_ = values;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17__length1 = values_length1;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp18_ = i;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19_ = _tmp17_[_tmp18_];
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp20_ = option;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = _tmp20_->constraint.string_list;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21__length1 = -1;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = j;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = _tmp21_[_tmp22_];
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (g_strcmp0 (_tmp19_, _tmp23_) == 0) {
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6529 "scanner.c"
+#line 6674 "scanner.c"
 						}
 					}
 				}
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = option;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp24_->constraint.string_list;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25__length1 = -1;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = j;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp25_[_tmp26_];
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp27_ != NULL) {
-#line 6545 "scanner.c"
-					SANE_Handle _tmp28_;
-					SANE_Option_Descriptor* _tmp29_;
-					SANE_Int _tmp30_;
-					gchar** _tmp31_;
-					gint _tmp31__length1;
-					gint _tmp32_;
-					const gchar* _tmp33_;
+#line 6690 "scanner.c"
+					SANE_Handle _tmp28_ = {0};
+					SANE_Option_Descriptor* _tmp29_ = NULL;
+					SANE_Int _tmp30_ = {0};
+					gchar** _tmp31_ = NULL;
+					gint _tmp31__length1 = 0;
+					gint _tmp32_ = 0;
+					const gchar* _tmp33_ = NULL;
 					gchar* _tmp34_ = NULL;
 					gboolean _tmp35_ = FALSE;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = handle;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = option;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = option_index;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = values;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31__length1 = values_length1;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp32_ = i;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = _tmp31_[_tmp32_];
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp35_ = scanner_set_string_option (self, _tmp28_, _tmp29_, _tmp30_, _tmp33_, &_tmp34_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (_vala_result);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_vala_result = _tmp34_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = _tmp35_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (_result_) {
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
-#line 6581 "scanner.c"
+#line 6726 "scanner.c"
 					} else {
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
-#line 6585 "scanner.c"
+#line 6730 "scanner.c"
 					}
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 6589 "scanner.c"
+#line 6734 "scanner.c"
 				}
 			}
 		}
 	}
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = g_strdup ("");
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp36_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6606 "scanner.c"
+#line 6751 "scanner.c"
 	} else {
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6610 "scanner.c"
+#line 6755 "scanner.c"
 	}
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6614 "scanner.c"
+#line 6759 "scanner.c"
 }
 
 
 static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descriptor* option) {
-	SANE_Int _tmp0_;
+	gchar* s = NULL;
+	SANE_Int _tmp0_ = {0};
 	gchar* _tmp1_ = NULL;
-	gchar* s;
-	SANE_Option_Descriptor* _tmp2_;
-	const gchar* _tmp3_;
-	SANE_Option_Descriptor* _tmp10_;
-	const gchar* _tmp11_;
-	SANE_Option_Descriptor* _tmp18_;
-	SANE_Value_Type _tmp19_;
-	const gchar* _tmp38_;
-	SANE_Option_Descriptor* _tmp39_;
-	SANE_Int _tmp40_;
+	SANE_Option_Descriptor* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	SANE_Option_Descriptor* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	SANE_Option_Descriptor* _tmp18_ = NULL;
+	SANE_Value_Type _tmp19_ = 0;
+	const gchar* _tmp38_ = NULL;
+	SANE_Option_Descriptor* _tmp39_ = NULL;
+	SANE_Int _tmp40_ = {0};
 	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_;
-	gchar* _tmp43_;
-	SANE_Option_Descriptor* _tmp44_;
-	SANE_Unit _tmp45_;
-	SANE_Option_Descriptor* _tmp64_;
-	SANE_Constraint_Type _tmp65_;
-	SANE_Option_Descriptor* _tmp151_;
-	SANE_Int _tmp152_;
-	SANE_Int cap;
-	SANE_Int _tmp153_;
-	const gchar* _tmp214_;
-	SANE_Option_Descriptor* _tmp215_;
-	const gchar* _tmp216_;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp42_ = NULL;
+	gchar* _tmp43_ = NULL;
+	SANE_Option_Descriptor* _tmp44_ = NULL;
+	SANE_Unit _tmp45_ = 0;
+	SANE_Option_Descriptor* _tmp64_ = NULL;
+	SANE_Constraint_Type _tmp65_ = 0;
+	SANE_Int cap = {0};
+	SANE_Option_Descriptor* _tmp151_ = NULL;
+	SANE_Int _tmp152_ = {0};
+	SANE_Int _tmp153_ = {0};
+	const gchar* _tmp214_ = NULL;
+	SANE_Option_Descriptor* _tmp215_ = NULL;
+	const gchar* _tmp216_ = NULL;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = index;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup_printf ("Option %d:", (gint) _tmp0_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp1_;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->name;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6661 "scanner.c"
-		const gchar* _tmp4_;
-		SANE_Option_Descriptor* _tmp5_;
-		const gchar* _tmp6_;
+#line 6806 "scanner.c"
+		const gchar* _tmp4_ = NULL;
+		SANE_Option_Descriptor* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = s;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->name;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = g_strdup_printf (" name='%s'", _tmp6_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strconcat (_tmp4_, _tmp8_, NULL);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp9_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
-#line 6686 "scanner.c"
+#line 6831 "scanner.c"
 	}
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->title;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6694 "scanner.c"
-		const gchar* _tmp12_;
-		SANE_Option_Descriptor* _tmp13_;
-		const gchar* _tmp14_;
+#line 6839 "scanner.c"
+		const gchar* _tmp12_ = NULL;
+		SANE_Option_Descriptor* _tmp13_ = NULL;
+		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_;
-		gchar* _tmp17_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = s;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->title;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = g_strdup_printf (" title='%s'", _tmp14_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = g_strconcat (_tmp12_, _tmp16_, NULL);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp17_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
-#line 6719 "scanner.c"
+#line 6864 "scanner.c"
 	}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->type;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp19_) {
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
-#line 6729 "scanner.c"
+#line 6874 "scanner.c"
 		{
-			const gchar* _tmp20_;
-			gchar* _tmp21_;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp20_ = NULL;
+			gchar* _tmp21_ = NULL;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = s;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strconcat (_tmp20_, " type=bool", NULL);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp21_;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6743 "scanner.c"
+#line 6888 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
-#line 6747 "scanner.c"
+#line 6892 "scanner.c"
 		{
-			const gchar* _tmp22_;
-			gchar* _tmp23_;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp22_ = NULL;
+			gchar* _tmp23_ = NULL;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = s;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = g_strconcat (_tmp22_, " type=int", NULL);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp23_;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6761 "scanner.c"
+#line 6906 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
-#line 6765 "scanner.c"
+#line 6910 "scanner.c"
 		{
-			const gchar* _tmp24_;
-			gchar* _tmp25_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp24_ = NULL;
+			gchar* _tmp25_ = NULL;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = s;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strconcat (_tmp24_, " type=fixed", NULL);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp25_;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6779 "scanner.c"
+#line 6924 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
-#line 6783 "scanner.c"
+#line 6928 "scanner.c"
 		{
-			const gchar* _tmp26_;
-			gchar* _tmp27_;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp26_ = NULL;
+			gchar* _tmp27_ = NULL;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = s;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = g_strconcat (_tmp26_, " type=string", NULL);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp27_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6797 "scanner.c"
+#line 6942 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
-#line 6801 "scanner.c"
+#line 6946 "scanner.c"
 		{
-			const gchar* _tmp28_;
-			gchar* _tmp29_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp28_ = NULL;
+			gchar* _tmp29_ = NULL;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = s;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_strconcat (_tmp28_, " type=button", NULL);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp29_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6815 "scanner.c"
+#line 6960 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
-#line 6819 "scanner.c"
+#line 6964 "scanner.c"
 		{
-			const gchar* _tmp30_;
-			gchar* _tmp31_;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp30_ = NULL;
+			gchar* _tmp31_ = NULL;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = s;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = g_strconcat (_tmp30_, " type=group", NULL);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp31_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6833 "scanner.c"
+#line 6978 "scanner.c"
 		}
 		default:
 		{
-			const gchar* _tmp32_;
-			SANE_Option_Descriptor* _tmp33_;
-			SANE_Value_Type _tmp34_;
+			const gchar* _tmp32_ = NULL;
+			SANE_Option_Descriptor* _tmp33_ = NULL;
+			SANE_Value_Type _tmp34_ = 0;
 			gchar* _tmp35_ = NULL;
-			gchar* _tmp36_;
-			gchar* _tmp37_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp36_ = NULL;
+			gchar* _tmp37_ = NULL;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = s;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = option;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = _tmp33_->type;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup_printf (" type=%d", (gint) _tmp34_);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = _tmp35_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp37_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp36_);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6863 "scanner.c"
+#line 7008 "scanner.c"
 		}
 	}
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = s;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = option;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = _tmp39_->size;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = g_strdup_printf (" size=%d", (gint) _tmp40_);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = g_strconcat (_tmp38_, _tmp42_, NULL);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp43_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp42_);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->unit;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp45_) {
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
-#line 6892 "scanner.c"
+#line 7037 "scanner.c"
 		{
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6896 "scanner.c"
+#line 7041 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
-#line 6900 "scanner.c"
+#line 7045 "scanner.c"
 		{
-			const gchar* _tmp46_;
-			gchar* _tmp47_;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp46_ = NULL;
+			gchar* _tmp47_ = NULL;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = s;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = g_strconcat (_tmp46_, " unit=pixels", NULL);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp47_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6914 "scanner.c"
+#line 7059 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
-#line 6918 "scanner.c"
+#line 7063 "scanner.c"
 		{
-			const gchar* _tmp48_;
-			gchar* _tmp49_;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp48_ = NULL;
+			gchar* _tmp49_ = NULL;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = s;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strconcat (_tmp48_, " unit=bits", NULL);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp49_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6932 "scanner.c"
+#line 7077 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
-#line 6936 "scanner.c"
+#line 7081 "scanner.c"
 		{
-			const gchar* _tmp50_;
-			gchar* _tmp51_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp50_ = NULL;
+			gchar* _tmp51_ = NULL;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = s;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strconcat (_tmp50_, " unit=mm", NULL);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp51_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6950 "scanner.c"
+#line 7095 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
-#line 6954 "scanner.c"
+#line 7099 "scanner.c"
 		{
-			const gchar* _tmp52_;
-			gchar* _tmp53_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp52_ = NULL;
+			gchar* _tmp53_ = NULL;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = s;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strconcat (_tmp52_, " unit=dpi", NULL);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp53_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6968 "scanner.c"
+#line 7113 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
-#line 6972 "scanner.c"
+#line 7117 "scanner.c"
 		{
-			const gchar* _tmp54_;
-			gchar* _tmp55_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp54_ = NULL;
+			gchar* _tmp55_ = NULL;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = s;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = g_strconcat (_tmp54_, " unit=percent", NULL);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp55_;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6986 "scanner.c"
+#line 7131 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
-#line 6990 "scanner.c"
+#line 7135 "scanner.c"
 		{
-			const gchar* _tmp56_;
-			gchar* _tmp57_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp56_ = NULL;
+			gchar* _tmp57_ = NULL;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = s;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp57_ = g_strconcat (_tmp56_, " unit=microseconds", NULL);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp57_;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7004 "scanner.c"
+#line 7149 "scanner.c"
 		}
 		default:
 		{
-			const gchar* _tmp58_;
-			SANE_Option_Descriptor* _tmp59_;
-			SANE_Unit _tmp60_;
+			const gchar* _tmp58_ = NULL;
+			SANE_Option_Descriptor* _tmp59_ = NULL;
+			SANE_Unit _tmp60_ = 0;
 			gchar* _tmp61_ = NULL;
-			gchar* _tmp62_;
-			gchar* _tmp63_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp62_ = NULL;
+			gchar* _tmp63_ = NULL;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp58_ = s;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp59_ = option;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp60_ = _tmp59_->unit;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp61_ = g_strdup_printf (" unit=%d", (gint) _tmp60_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp62_ = _tmp61_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp63_ = g_strconcat (_tmp58_, _tmp62_, NULL);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp63_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp62_);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7034 "scanner.c"
+#line 7179 "scanner.c"
 		}
 	}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = option;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_->constraint_type;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp65_) {
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
-#line 7045 "scanner.c"
+#line 7190 "scanner.c"
 		{
-			SANE_Option_Descriptor* _tmp66_;
-			SANE_Value_Type _tmp67_;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			SANE_Option_Descriptor* _tmp66_ = NULL;
+			SANE_Value_Type _tmp67_ = 0;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp66_ = option;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp67_ = _tmp66_->type;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7055 "scanner.c"
-				const gchar* _tmp68_;
-				SANE_Option_Descriptor* _tmp69_;
-				SANE_Range* _tmp70_;
-				SANE_Word _tmp71_;
+#line 7200 "scanner.c"
+				const gchar* _tmp68_ = NULL;
+				SANE_Option_Descriptor* _tmp69_ = NULL;
+				SANE_Range* _tmp70_ = NULL;
+				SANE_Word _tmp71_ = {0};
 				gdouble _tmp72_ = 0.0;
-				SANE_Option_Descriptor* _tmp73_;
-				SANE_Range* _tmp74_;
-				SANE_Word _tmp75_;
+				SANE_Option_Descriptor* _tmp73_ = NULL;
+				SANE_Range* _tmp74_ = NULL;
+				SANE_Word _tmp75_ = {0};
 				gdouble _tmp76_ = 0.0;
-				SANE_Option_Descriptor* _tmp77_;
-				SANE_Range* _tmp78_;
-				SANE_Word _tmp79_;
+				SANE_Option_Descriptor* _tmp77_ = NULL;
+				SANE_Range* _tmp78_ = NULL;
+				SANE_Word _tmp79_ = {0};
 				gchar* _tmp80_ = NULL;
-				gchar* _tmp81_;
-				gchar* _tmp82_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar* _tmp81_ = NULL;
+				gchar* _tmp82_ = NULL;
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp68_ = s;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp69_ = option;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp70_ = _tmp69_->constraint.range;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp71_ = _tmp70_->min;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp72_ = SANE_UNFIX ((SANE_Fixed) _tmp71_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp73_ = option;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp74_ = _tmp73_->constraint.range;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp75_ = _tmp74_->max;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp76_ = SANE_UNFIX ((SANE_Fixed) _tmp75_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp77_ = option;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp78_ = _tmp77_->constraint.range;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp79_ = _tmp78_->quant;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp80_ = g_strdup_printf (" min=%f, max=%f, quant=%d", _tmp72_, _tmp76_, (gint) _tmp79_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp81_ = _tmp80_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp82_ = g_strconcat (_tmp68_, _tmp81_, NULL);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp82_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
-#line 7107 "scanner.c"
+#line 7252 "scanner.c"
 			} else {
-				const gchar* _tmp83_;
-				SANE_Option_Descriptor* _tmp84_;
-				SANE_Range* _tmp85_;
-				SANE_Word _tmp86_;
-				SANE_Option_Descriptor* _tmp87_;
-				SANE_Range* _tmp88_;
-				SANE_Word _tmp89_;
-				SANE_Option_Descriptor* _tmp90_;
-				SANE_Range* _tmp91_;
-				SANE_Word _tmp92_;
+				const gchar* _tmp83_ = NULL;
+				SANE_Option_Descriptor* _tmp84_ = NULL;
+				SANE_Range* _tmp85_ = NULL;
+				SANE_Word _tmp86_ = {0};
+				SANE_Option_Descriptor* _tmp87_ = NULL;
+				SANE_Range* _tmp88_ = NULL;
+				SANE_Word _tmp89_ = {0};
+				SANE_Option_Descriptor* _tmp90_ = NULL;
+				SANE_Range* _tmp91_ = NULL;
+				SANE_Word _tmp92_ = {0};
 				gchar* _tmp93_ = NULL;
-				gchar* _tmp94_;
-				gchar* _tmp95_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar* _tmp94_ = NULL;
+				gchar* _tmp95_ = NULL;
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp83_ = s;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = option;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = _tmp84_->constraint.range;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp86_ = _tmp85_->min;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp87_ = option;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp88_ = _tmp87_->constraint.range;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp89_ = _tmp88_->max;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp90_ = option;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp91_ = _tmp90_->constraint.range;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp92_ = _tmp91_->quant;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp93_ = g_strdup_printf (" min=%d, max=%d, quant=%d", (gint) _tmp86_, (gint) _tmp89_, (gint) _tmp92_);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp94_ = _tmp93_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp95_ = g_strconcat (_tmp83_, _tmp94_, NULL);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp95_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
-#line 7154 "scanner.c"
+#line 7299 "scanner.c"
 			}
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7158 "scanner.c"
+#line 7303 "scanner.c"
 		}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
-#line 7162 "scanner.c"
+#line 7307 "scanner.c"
 		{
-			const gchar* _tmp96_;
-			gchar* _tmp97_;
-			const gchar* _tmp127_;
-			gchar* _tmp128_;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp96_ = NULL;
+			gchar* _tmp97_ = NULL;
+			const gchar* _tmp127_ = NULL;
+			gchar* _tmp128_ = NULL;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp96_ = s;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp97_ = g_strconcat (_tmp96_, " values=[", NULL);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
-#line 7176 "scanner.c"
+#line 7321 "scanner.c"
 			{
-				gint i;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gint i = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7181 "scanner.c"
+#line 7326 "scanner.c"
 				{
-					gboolean _tmp98_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp98_ = FALSE;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7188 "scanner.c"
-						gboolean _tmp99_;
-						gint _tmp101_;
-						SANE_Option_Descriptor* _tmp102_;
-						SANE_Word* _tmp103_;
-						gint _tmp103__length1;
-						SANE_Word _tmp104_;
-						gint _tmp105_;
-						SANE_Option_Descriptor* _tmp108_;
-						SANE_Value_Type _tmp109_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7333 "scanner.c"
+						gboolean _tmp99_ = FALSE;
+						gint _tmp101_ = 0;
+						SANE_Option_Descriptor* _tmp102_ = NULL;
+						SANE_Word* _tmp103_ = NULL;
+						gint _tmp103__length1 = 0;
+						SANE_Word _tmp104_ = {0};
+						gint _tmp105_ = 0;
+						SANE_Option_Descriptor* _tmp108_ = NULL;
+						SANE_Value_Type _tmp109_ = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp99_ = _tmp98_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp99_) {
-#line 7202 "scanner.c"
-							gint _tmp100_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7347 "scanner.c"
+							gint _tmp100_ = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp100_ = i;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp100_ + 1;
-#line 7208 "scanner.c"
+#line 7353 "scanner.c"
 						}
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp101_ = i;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102_ = option;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103_ = _tmp102_->constraint.word_list;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103__length1 = -1;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = _tmp103_[0];
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp101_) < _tmp104_)) {
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7226 "scanner.c"
+#line 7371 "scanner.c"
 						}
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp105_ = i;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp105_ != 0) {
-#line 7232 "scanner.c"
-							const gchar* _tmp106_;
-							gchar* _tmp107_;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7377 "scanner.c"
+							const gchar* _tmp106_ = NULL;
+							gchar* _tmp107_ = NULL;
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp106_ = s;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp107_ = g_strconcat (_tmp106_, ", ", NULL);
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp107_;
-#line 7243 "scanner.c"
+#line 7388 "scanner.c"
 						}
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp108_ = option;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp109_ = _tmp108_->type;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp109_ == SANE_TYPE_INT) {
-#line 7251 "scanner.c"
-							const gchar* _tmp110_;
-							SANE_Option_Descriptor* _tmp111_;
-							SANE_Word* _tmp112_;
-							gint _tmp112__length1;
-							gint _tmp113_;
-							SANE_Word _tmp114_;
+#line 7396 "scanner.c"
+							const gchar* _tmp110_ = NULL;
+							SANE_Option_Descriptor* _tmp111_ = NULL;
+							SANE_Word* _tmp112_ = NULL;
+							gint _tmp112__length1 = 0;
+							gint _tmp113_ = 0;
+							SANE_Word _tmp114_ = {0};
 							gchar* _tmp115_ = NULL;
-							gchar* _tmp116_;
-							gchar* _tmp117_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							gchar* _tmp116_ = NULL;
+							gchar* _tmp117_ = NULL;
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp110_ = s;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111_ = option;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = _tmp111_->constraint.word_list;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112__length1 = -1;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp113_ = i;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp114_ = _tmp112_[_tmp113_ + 1];
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp115_ = g_strdup_printf ("%d", (gint) _tmp114_);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp116_ = _tmp115_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp117_ = g_strconcat (_tmp110_, _tmp116_, NULL);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp117_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp116_);
-#line 7285 "scanner.c"
+#line 7430 "scanner.c"
 						} else {
-							const gchar* _tmp118_;
-							SANE_Option_Descriptor* _tmp119_;
-							SANE_Word* _tmp120_;
-							gint _tmp120__length1;
-							gint _tmp121_;
-							SANE_Word _tmp122_;
+							const gchar* _tmp118_ = NULL;
+							SANE_Option_Descriptor* _tmp119_ = NULL;
+							SANE_Word* _tmp120_ = NULL;
+							gint _tmp120__length1 = 0;
+							gint _tmp121_ = 0;
+							SANE_Word _tmp122_ = {0};
 							gdouble _tmp123_ = 0.0;
 							gchar* _tmp124_ = NULL;
-							gchar* _tmp125_;
-							gchar* _tmp126_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							gchar* _tmp125_ = NULL;
+							gchar* _tmp126_ = NULL;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = s;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119_ = option;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120_ = _tmp119_->constraint.word_list;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120__length1 = -1;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp121_ = i;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp122_ = _tmp120_[_tmp121_ + 1];
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp123_ = SANE_UNFIX ((SANE_Fixed) _tmp122_);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp124_ = g_strdup_printf ("%f", _tmp123_);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp125_ = _tmp124_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp126_ = g_strconcat (_tmp118_, _tmp125_, NULL);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp126_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp125_);
-#line 7323 "scanner.c"
+#line 7468 "scanner.c"
 						}
 					}
 				}
 			}
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = s;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strconcat (_tmp127_, "]", NULL);
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp128_;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7338 "scanner.c"
+#line 7483 "scanner.c"
 		}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
-#line 7342 "scanner.c"
+#line 7487 "scanner.c"
 		{
-			const gchar* _tmp129_;
-			gchar* _tmp130_;
-			const gchar* _tmp149_;
-			gchar* _tmp150_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp129_ = NULL;
+			gchar* _tmp130_ = NULL;
+			const gchar* _tmp149_ = NULL;
+			gchar* _tmp150_ = NULL;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = s;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = g_strconcat (_tmp129_, " values=[", NULL);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp130_;
-#line 7356 "scanner.c"
+#line 7501 "scanner.c"
 			{
-				gint i;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gint i = 0;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7361 "scanner.c"
+#line 7506 "scanner.c"
 				{
-					gboolean _tmp131_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp131_ = FALSE;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp131_ = TRUE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7368 "scanner.c"
-						gboolean _tmp132_;
-						SANE_Option_Descriptor* _tmp134_;
-						gchar** _tmp135_;
-						gint _tmp135__length1;
-						gint _tmp136_;
-						const gchar* _tmp137_;
-						gint _tmp138_;
-						const gchar* _tmp141_;
-						SANE_Option_Descriptor* _tmp142_;
-						gchar** _tmp143_;
-						gint _tmp143__length1;
-						gint _tmp144_;
-						const gchar* _tmp145_;
+#line 7513 "scanner.c"
+						gboolean _tmp132_ = FALSE;
+						SANE_Option_Descriptor* _tmp134_ = NULL;
+						gchar** _tmp135_ = NULL;
+						gint _tmp135__length1 = 0;
+						gint _tmp136_ = 0;
+						const gchar* _tmp137_ = NULL;
+						gint _tmp138_ = 0;
+						const gchar* _tmp141_ = NULL;
+						SANE_Option_Descriptor* _tmp142_ = NULL;
+						gchar** _tmp143_ = NULL;
+						gint _tmp143__length1 = 0;
+						gint _tmp144_ = 0;
+						const gchar* _tmp145_ = NULL;
 						gchar* _tmp146_ = NULL;
-						gchar* _tmp147_;
-						gchar* _tmp148_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						gchar* _tmp147_ = NULL;
+						gchar* _tmp148_ = NULL;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp132_ = _tmp131_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp132_) {
-#line 7389 "scanner.c"
-							gint _tmp133_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7534 "scanner.c"
+							gint _tmp133_ = 0;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp133_ = i;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp133_ + 1;
-#line 7395 "scanner.c"
+#line 7540 "scanner.c"
 						}
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp131_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp134_ = option;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135_ = _tmp134_->constraint.string_list;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135__length1 = -1;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp137_ = _tmp135_[_tmp136_];
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp137_ != NULL)) {
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7413 "scanner.c"
+#line 7558 "scanner.c"
 						}
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp138_ = i;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp138_ != 0) {
-#line 7419 "scanner.c"
-							const gchar* _tmp139_;
-							gchar* _tmp140_;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7564 "scanner.c"
+							const gchar* _tmp139_ = NULL;
+							gchar* _tmp140_ = NULL;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp139_ = s;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp140_ = g_strconcat (_tmp139_, ", ", NULL);
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp140_;
-#line 7430 "scanner.c"
+#line 7575 "scanner.c"
 						}
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141_ = s;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp142_ = option;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = _tmp142_->constraint.string_list;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143__length1 = -1;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp144_ = i;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp145_ = _tmp143_[_tmp144_];
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp146_ = g_strdup_printf ("\"%s\"", _tmp145_);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp147_ = _tmp146_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp148_ = g_strconcat (_tmp141_, _tmp147_, NULL);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (s);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						s = _tmp148_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp147_);
-#line 7456 "scanner.c"
+#line 7601 "scanner.c"
 					}
 				}
 			}
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp149_ = s;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_ = g_strconcat (_tmp149_, "]", NULL);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp150_;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7470 "scanner.c"
+#line 7615 "scanner.c"
 		}
 		default:
 		{
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7476 "scanner.c"
+#line 7621 "scanner.c"
 		}
 	}
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp151_ = option;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp152_ = _tmp151_->cap;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	cap = _tmp152_;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp153_ = cap;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp153_ != ((SANE_Int) 0)) {
-#line 7489 "scanner.c"
-		const gchar* _tmp154_;
-		gchar* _tmp155_;
-		SANE_Int _tmp156_;
-		SANE_Int _tmp163_;
-		SANE_Int _tmp170_;
-		SANE_Int _tmp177_;
-		SANE_Int _tmp184_;
-		SANE_Int _tmp191_;
-		SANE_Int _tmp198_;
-		SANE_Int _tmp205_;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7634 "scanner.c"
+		const gchar* _tmp154_ = NULL;
+		gchar* _tmp155_ = NULL;
+		SANE_Int _tmp156_ = {0};
+		SANE_Int _tmp163_ = {0};
+		SANE_Int _tmp170_ = {0};
+		SANE_Int _tmp177_ = {0};
+		SANE_Int _tmp184_ = {0};
+		SANE_Int _tmp191_ = {0};
+		SANE_Int _tmp198_ = {0};
+		SANE_Int _tmp205_ = {0};
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = s;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = g_strconcat (_tmp154_, " cap=", NULL);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp155_;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = cap;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp156_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7512 "scanner.c"
-			const gchar* _tmp157_;
-			const gchar* _tmp160_;
-			gchar* _tmp161_;
-			SANE_Int _tmp162_;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7657 "scanner.c"
+			const gchar* _tmp157_ = NULL;
+			const gchar* _tmp160_ = NULL;
+			gchar* _tmp161_ = NULL;
+			SANE_Int _tmp162_ = {0};
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = s;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp157_, "") != 0) {
-#line 7521 "scanner.c"
-				const gchar* _tmp158_;
-				gchar* _tmp159_;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7666 "scanner.c"
+				const gchar* _tmp158_ = NULL;
+				gchar* _tmp159_ = NULL;
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp158_ = s;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp159_ = g_strconcat (_tmp158_, ",", NULL);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp159_;
-#line 7532 "scanner.c"
+#line 7677 "scanner.c"
 			}
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = s;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp161_ = g_strconcat (_tmp160_, "soft-select", NULL);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp161_;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp162_ = cap;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp162_ & (~SANE_CAP_SOFT_SELECT);
-#line 7546 "scanner.c"
+#line 7691 "scanner.c"
 		}
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp163_ = cap;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp163_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7552 "scanner.c"
-			const gchar* _tmp164_;
-			const gchar* _tmp167_;
-			gchar* _tmp168_;
-			SANE_Int _tmp169_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7697 "scanner.c"
+			const gchar* _tmp164_ = NULL;
+			const gchar* _tmp167_ = NULL;
+			gchar* _tmp168_ = NULL;
+			SANE_Int _tmp169_ = {0};
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp164_ = s;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp164_, "") != 0) {
-#line 7561 "scanner.c"
-				const gchar* _tmp165_;
-				gchar* _tmp166_;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7706 "scanner.c"
+				const gchar* _tmp165_ = NULL;
+				gchar* _tmp166_ = NULL;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp165_ = s;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp166_ = g_strconcat (_tmp165_, ",", NULL);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp166_;
-#line 7572 "scanner.c"
+#line 7717 "scanner.c"
 			}
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp167_ = s;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp168_ = g_strconcat (_tmp167_, "hard-select", NULL);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp168_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = cap;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp169_ & (~SANE_CAP_HARD_SELECT);
-#line 7586 "scanner.c"
+#line 7731 "scanner.c"
 		}
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp170_ = cap;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp170_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7592 "scanner.c"
-			const gchar* _tmp171_;
-			const gchar* _tmp174_;
-			gchar* _tmp175_;
-			SANE_Int _tmp176_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7737 "scanner.c"
+			const gchar* _tmp171_ = NULL;
+			const gchar* _tmp174_ = NULL;
+			gchar* _tmp175_ = NULL;
+			SANE_Int _tmp176_ = {0};
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp171_ = s;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp171_, "") != 0) {
-#line 7601 "scanner.c"
-				const gchar* _tmp172_;
-				gchar* _tmp173_;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7746 "scanner.c"
+				const gchar* _tmp172_ = NULL;
+				gchar* _tmp173_ = NULL;
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp172_ = s;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = g_strconcat (_tmp172_, ",", NULL);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp173_;
-#line 7612 "scanner.c"
+#line 7757 "scanner.c"
 			}
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp174_ = s;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp175_ = g_strconcat (_tmp174_, "soft-detect", NULL);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp175_;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp176_ = cap;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp176_ & (~SANE_CAP_SOFT_DETECT);
-#line 7626 "scanner.c"
+#line 7771 "scanner.c"
 		}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp177_ = cap;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp177_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7632 "scanner.c"
-			const gchar* _tmp178_;
-			const gchar* _tmp181_;
-			gchar* _tmp182_;
-			SANE_Int _tmp183_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7777 "scanner.c"
+			const gchar* _tmp178_ = NULL;
+			const gchar* _tmp181_ = NULL;
+			gchar* _tmp182_ = NULL;
+			SANE_Int _tmp183_ = {0};
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp178_ = s;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp178_, "") != 0) {
-#line 7641 "scanner.c"
-				const gchar* _tmp179_;
-				gchar* _tmp180_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7786 "scanner.c"
+				const gchar* _tmp179_ = NULL;
+				gchar* _tmp180_ = NULL;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp179_ = s;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp180_ = g_strconcat (_tmp179_, ",", NULL);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp180_;
-#line 7652 "scanner.c"
+#line 7797 "scanner.c"
 			}
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = s;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = g_strconcat (_tmp181_, "emulated", NULL);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp182_;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = cap;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp183_ & (~SANE_CAP_EMULATED);
-#line 7666 "scanner.c"
+#line 7811 "scanner.c"
 		}
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp184_ = cap;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp184_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7672 "scanner.c"
-			const gchar* _tmp185_;
-			const gchar* _tmp188_;
-			gchar* _tmp189_;
-			SANE_Int _tmp190_;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7817 "scanner.c"
+			const gchar* _tmp185_ = NULL;
+			const gchar* _tmp188_ = NULL;
+			gchar* _tmp189_ = NULL;
+			SANE_Int _tmp190_ = {0};
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = s;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp185_, "") != 0) {
-#line 7681 "scanner.c"
-				const gchar* _tmp186_;
-				gchar* _tmp187_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7826 "scanner.c"
+				const gchar* _tmp186_ = NULL;
+				gchar* _tmp187_ = NULL;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp186_ = s;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp187_ = g_strconcat (_tmp186_, ",", NULL);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp187_;
-#line 7692 "scanner.c"
+#line 7837 "scanner.c"
 			}
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = s;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = g_strconcat (_tmp188_, "automatic", NULL);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp189_;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = cap;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp190_ & (~SANE_CAP_AUTOMATIC);
-#line 7706 "scanner.c"
+#line 7851 "scanner.c"
 		}
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp191_ = cap;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp191_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7712 "scanner.c"
-			const gchar* _tmp192_;
-			const gchar* _tmp195_;
-			gchar* _tmp196_;
-			SANE_Int _tmp197_;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7857 "scanner.c"
+			const gchar* _tmp192_ = NULL;
+			const gchar* _tmp195_ = NULL;
+			gchar* _tmp196_ = NULL;
+			SANE_Int _tmp197_ = {0};
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192_ = s;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp192_, "") != 0) {
-#line 7721 "scanner.c"
-				const gchar* _tmp193_;
-				gchar* _tmp194_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7866 "scanner.c"
+				const gchar* _tmp193_ = NULL;
+				gchar* _tmp194_ = NULL;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp193_ = s;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp194_ = g_strconcat (_tmp193_, ",", NULL);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp194_;
-#line 7732 "scanner.c"
+#line 7877 "scanner.c"
 			}
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp195_ = s;
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp196_ = g_strconcat (_tmp195_, "inactive", NULL);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp196_;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp197_ = cap;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp197_ & (~SANE_CAP_INACTIVE);
-#line 7746 "scanner.c"
+#line 7891 "scanner.c"
 		}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp198_ = cap;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp198_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7752 "scanner.c"
-			const gchar* _tmp199_;
-			const gchar* _tmp202_;
-			gchar* _tmp203_;
-			SANE_Int _tmp204_;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7897 "scanner.c"
+			const gchar* _tmp199_ = NULL;
+			const gchar* _tmp202_ = NULL;
+			gchar* _tmp203_ = NULL;
+			SANE_Int _tmp204_ = {0};
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp199_ = s;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp199_, "") != 0) {
-#line 7761 "scanner.c"
-				const gchar* _tmp200_;
-				gchar* _tmp201_;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7906 "scanner.c"
+				const gchar* _tmp200_ = NULL;
+				gchar* _tmp201_ = NULL;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp200_ = s;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp201_ = g_strconcat (_tmp200_, ",", NULL);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp201_;
-#line 7772 "scanner.c"
+#line 7917 "scanner.c"
 			}
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = s;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp203_ = g_strconcat (_tmp202_, "advanced", NULL);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp203_;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = cap;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp204_ & (~SANE_CAP_ADVANCED);
-#line 7786 "scanner.c"
+#line 7931 "scanner.c"
 		}
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp205_ = cap;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp205_ != ((SANE_Int) 0)) {
-#line 7792 "scanner.c"
-			const gchar* _tmp206_;
-			const gchar* _tmp209_;
-			SANE_Int _tmp210_;
+#line 7937 "scanner.c"
+			const gchar* _tmp206_ = NULL;
+			const gchar* _tmp209_ = NULL;
+			SANE_Int _tmp210_ = {0};
 			gchar* _tmp211_ = NULL;
-			gchar* _tmp212_;
-			gchar* _tmp213_;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp212_ = NULL;
+			gchar* _tmp213_ = NULL;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp206_ = s;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp206_, "") != 0) {
-#line 7803 "scanner.c"
-				const gchar* _tmp207_;
-				gchar* _tmp208_;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7948 "scanner.c"
+				const gchar* _tmp207_ = NULL;
+				gchar* _tmp208_ = NULL;
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp207_ = s;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp208_ = g_strconcat (_tmp207_, ",", NULL);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp208_;
-#line 7814 "scanner.c"
+#line 7959 "scanner.c"
 			}
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = s;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = cap;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp211_ = g_strdup_printf ("%x", (guint) ((gint) _tmp210_));
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp212_ = _tmp211_;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp213_ = g_strconcat (_tmp209_, _tmp212_, NULL);
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp213_;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp212_);
-#line 7832 "scanner.c"
+#line 7977 "scanner.c"
 		}
 	}
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp214_ = s;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:708: %s", _tmp214_);
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:734: %s", _tmp214_);
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp215_ = option;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp216_ = _tmp215_->desc;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp216_ != NULL) {
-#line 7845 "scanner.c"
-		SANE_Option_Descriptor* _tmp217_;
-		const gchar* _tmp218_;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7990 "scanner.c"
+		SANE_Option_Descriptor* _tmp217_ = NULL;
+		const gchar* _tmp218_ = NULL;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp217_ = option;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp218_ = _tmp217_->desc;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:711:   Description: %s", _tmp218_);
-#line 7854 "scanner.c"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:737:   Description: %s", _tmp218_);
+#line 7999 "scanner.c"
 	}
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 7858 "scanner.c"
+#line 8003 "scanner.c"
 }
 
 
 static void scanner_authorization_cb (const gchar* resource, gchar* username, int username_length1, gchar* password, int password_length1) {
-	Scanner* _tmp0_;
-	const gchar* _tmp1_;
-	NotifyRequestAuthorization* _tmp2_;
-	NotifyRequestAuthorization* _tmp3_;
-	Scanner* _tmp4_;
-	GAsyncQueue* _tmp5_;
+	Scanner* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	NotifyRequestAuthorization* _tmp2_ = NULL;
+	NotifyRequestAuthorization* _tmp3_ = NULL;
+	Credentials* credentials = NULL;
+	Scanner* _tmp4_ = NULL;
+	GAsyncQueue* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-	Credentials* credentials;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (resource != NULL);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = resource;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_request_authorization_new (_tmp1_);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (_tmp0_, (Notify*) _tmp3_);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = scanner_scanner_object;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->priv->authorize_queue;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = g_async_queue_pop (_tmp5_);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 7893 "scanner.c"
+#line 8038 "scanner.c"
 	{
-		gint i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gint i = 0;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 7898 "scanner.c"
+#line 8043 "scanner.c"
 		{
-			gboolean _tmp7_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gboolean _tmp7_ = FALSE;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 7905 "scanner.c"
-				gboolean _tmp8_;
+#line 8050 "scanner.c"
+				gboolean _tmp8_ = FALSE;
 				gboolean _tmp10_ = FALSE;
-				Credentials* _tmp11_;
-				const gchar* _tmp12_;
-				gint _tmp13_;
+				Credentials* _tmp11_ = NULL;
+				const gchar* _tmp12_ = NULL;
+				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
-				gboolean _tmp17_;
-				gchar* _tmp18_;
-				gint _tmp18__length1;
-				gint _tmp19_;
-				Credentials* _tmp20_;
-				const gchar* _tmp21_;
-				gint _tmp22_;
+				gboolean _tmp17_ = FALSE;
+				gchar* _tmp18_ = NULL;
+				gint _tmp18__length1 = 0;
+				gint _tmp19_ = 0;
+				Credentials* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
+				gint _tmp22_ = 0;
 				gchar _tmp23_ = '\0';
-				gchar _tmp24_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar _tmp24_ = '\0';
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp7_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
-#line 7925 "scanner.c"
-					gint _tmp9_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8070 "scanner.c"
+					gint _tmp9_ = 0;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
-#line 7931 "scanner.c"
+#line 8076 "scanner.c"
 				}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = credentials;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = _tmp11_->username;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp14_ != '\0') {
-#line 7945 "scanner.c"
-					gint _tmp15_;
-					gint _tmp16_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8090 "scanner.c"
+					gint _tmp15_ = 0;
+					gint _tmp16_ = 0;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp15_ = i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp16_ = SANE_MAX_USERNAME_LEN;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = _tmp15_ < _tmp16_;
-#line 7954 "scanner.c"
+#line 8099 "scanner.c"
 				} else {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = FALSE;
-#line 7958 "scanner.c"
+#line 8103 "scanner.c"
 				}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = _tmp10_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp17_) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 7966 "scanner.c"
+#line 8111 "scanner.c"
 				}
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = username;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18__length1 = username_length1;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = i;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = credentials;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = _tmp20_->username;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = i;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = string_get (_tmp21_, (glong) _tmp22_);
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_[_tmp19_] = _tmp23_;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = _tmp18_[_tmp19_];
-#line 7986 "scanner.c"
+#line 8131 "scanner.c"
 			}
 		}
 	}
 	{
-		gint i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gint i = 0;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 7994 "scanner.c"
+#line 8139 "scanner.c"
 		{
-			gboolean _tmp25_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gboolean _tmp25_ = FALSE;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = TRUE;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8001 "scanner.c"
-				gboolean _tmp26_;
+#line 8146 "scanner.c"
+				gboolean _tmp26_ = FALSE;
 				gboolean _tmp28_ = FALSE;
-				Credentials* _tmp29_;
-				const gchar* _tmp30_;
-				gint _tmp31_;
+				Credentials* _tmp29_ = NULL;
+				const gchar* _tmp30_ = NULL;
+				gint _tmp31_ = 0;
 				gchar _tmp32_ = '\0';
-				gboolean _tmp35_;
-				gchar* _tmp36_;
-				gint _tmp36__length1;
-				gint _tmp37_;
-				Credentials* _tmp38_;
-				const gchar* _tmp39_;
-				gint _tmp40_;
+				gboolean _tmp35_ = FALSE;
+				gchar* _tmp36_ = NULL;
+				gint _tmp36__length1 = 0;
+				gint _tmp37_ = 0;
+				Credentials* _tmp38_ = NULL;
+				const gchar* _tmp39_ = NULL;
+				gint _tmp40_ = 0;
 				gchar _tmp41_ = '\0';
-				gchar _tmp42_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar _tmp42_ = '\0';
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = _tmp25_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp26_) {
-#line 8021 "scanner.c"
-					gint _tmp27_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8166 "scanner.c"
+					gint _tmp27_ = 0;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp27_ = i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp27_ + 1;
-#line 8027 "scanner.c"
+#line 8172 "scanner.c"
 				}
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = FALSE;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = credentials;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_ = _tmp29_->password;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_ = i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = string_get (_tmp30_, (glong) _tmp31_);
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp32_ != '\0') {
-#line 8041 "scanner.c"
-					gint _tmp33_;
-					gint _tmp34_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8186 "scanner.c"
+					gint _tmp33_ = 0;
+					gint _tmp34_ = 0;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp34_ = SANE_MAX_USERNAME_LEN;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = _tmp33_ < _tmp34_;
-#line 8050 "scanner.c"
+#line 8195 "scanner.c"
 				} else {
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = FALSE;
-#line 8054 "scanner.c"
+#line 8199 "scanner.c"
 				}
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp28_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp35_) {
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8062 "scanner.c"
+#line 8207 "scanner.c"
 				}
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = password;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36__length1 = password_length1;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = i;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = credentials;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp39_ = _tmp38_->password;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp40_ = i;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_[_tmp37_] = _tmp41_;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp42_ = _tmp36_[_tmp37_];
-#line 8082 "scanner.c"
+#line 8227 "scanner.c"
 			}
 		}
 	}
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8088 "scanner.c"
+#line 8233 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8095 "scanner.c"
+#line 8240 "scanner.c"
 }
 
 
 void scanner_authorize (Scanner* self, const gchar* username, const gchar* password) {
-	Credentials* _tmp0_;
-	Credentials* credentials;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	GAsyncQueue* _tmp5_;
-	Credentials* _tmp6_;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	Credentials* credentials = NULL;
+	Credentials* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	GAsyncQueue* _tmp5_ = NULL;
+	Credentials* _tmp6_ = NULL;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (username != NULL);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (password != NULL);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = credentials_new ();
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = _tmp0_;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = username;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->username);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->username = _tmp2_;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = password;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->password);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->password = _tmp4_;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->authorize_queue;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _credentials_ref0 (credentials);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp5_, _tmp6_);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8142 "scanner.c"
+#line 8287 "scanner.c"
 }
 
 
 static void scanner_close_device (Scanner* self) {
-	gboolean _tmp0_;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gboolean _tmp0_ = FALSE;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->have_handle;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8154 "scanner.c"
-		SANE_Handle _tmp1_;
-		SANE_Handle _tmp2_;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8299 "scanner.c"
+		SANE_Handle _tmp1_ = {0};
+		SANE_Handle _tmp2_ = {0};
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = self->priv->handle;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_cancel (_tmp1_);
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:738: sane_cancel ()");
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:764: sane_cancel ()");
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->handle;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp2_);
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:741: sane_close ()");
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:767: sane_close ()");
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_hash_table_unref0 (self->priv->options);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8175 "scanner.c"
+#line 8320 "scanner.c"
 	}
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = NULL;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = 0;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = NULL;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8191 "scanner.c"
+#line 8336 "scanner.c"
 }
 
 
 static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* error_string) {
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	NotifyScanFailed* _tmp2_;
-	NotifyScanFailed* _tmp3_;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	NotifyScanFailed* _tmp2_ = NULL;
+	NotifyScanFailed* _tmp3_ = NULL;
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (error_string != NULL);
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_close_device (self);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp3_);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8220 "scanner.c"
+#line 8365 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8227 "scanner.c"
+#line 8372 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8234 "scanner.c"
+#line 8379 "scanner.c"
 }
 
 
 static gboolean scanner_handle_requests (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	ScanState _tmp1_;
-	gboolean _tmp3_;
-	gint request_count;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanState _tmp1_ = 0;
+	gboolean _tmp3_ = FALSE;
+	gint request_count = 0;
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->state;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8250 "scanner.c"
-		gboolean _tmp2_;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8395 "scanner.c"
+		gboolean _tmp2_ = FALSE;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8256 "scanner.c"
+#line 8401 "scanner.c"
 	} else {
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8260 "scanner.c"
+#line 8405 "scanner.c"
 	}
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp0_;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8268 "scanner.c"
+#line 8413 "scanner.c"
 	}
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8274 "scanner.c"
+#line 8419 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-		ScanState _tmp6_;
-		gboolean _tmp8_;
-		gboolean _tmp11_;
-		gint _tmp14_;
-		Request* _tmp15_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		ScanState _tmp6_ = 0;
+		gboolean _tmp8_ = FALSE;
+		gboolean _tmp11_ = FALSE;
+		gint _tmp14_ = 0;
+		Request* _tmp15_ = NULL;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->state;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp6_ == SCAN_STATE_IDLE) {
-#line 8287 "scanner.c"
-			gint _tmp7_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8432 "scanner.c"
+			gint _tmp7_ = 0;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = request_count;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = _tmp7_ == 0;
-#line 8293 "scanner.c"
+#line 8438 "scanner.c"
 		} else {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = FALSE;
-#line 8297 "scanner.c"
+#line 8442 "scanner.c"
 		}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp5_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_) {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
-#line 8305 "scanner.c"
+#line 8450 "scanner.c"
 		} else {
-			GAsyncQueue* _tmp9_;
+			GAsyncQueue* _tmp9_ = NULL;
 			gint _tmp10_ = 0;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = self->priv->request_queue;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = g_async_queue_length (_tmp9_);
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp10_ > 0;
-#line 8315 "scanner.c"
+#line 8460 "scanner.c"
 		}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp4_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp11_) {
-#line 8321 "scanner.c"
-			GAsyncQueue* _tmp12_;
+#line 8466 "scanner.c"
+			GAsyncQueue* _tmp12_ = NULL;
 			gpointer _tmp13_ = NULL;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = self->priv->request_queue;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = g_async_queue_pop (_tmp12_);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp13_;
-#line 8332 "scanner.c"
+#line 8477 "scanner.c"
 		} else {
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8340 "scanner.c"
+#line 8485 "scanner.c"
 		}
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:776: Processing request");
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:802: Processing request");
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = request_count;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_count = _tmp14_ + 1;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = request;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_REQUEST_START_SCAN)) {
-#line 8352 "scanner.c"
-			Request* _tmp16_;
-			RequestStartScan* _tmp17_;
-			RequestStartScan* r;
-			RequestStartScan* _tmp18_;
-			ScanJob* _tmp19_;
-			ScanJob* _tmp20_;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8497 "scanner.c"
+			RequestStartScan* r = NULL;
+			Request* _tmp16_ = NULL;
+			RequestStartScan* _tmp17_ = NULL;
+			RequestStartScan* _tmp18_ = NULL;
+			ScanJob* _tmp19_ = NULL;
+			ScanJob* _tmp20_ = NULL;
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = request;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_REQUEST_START_SCAN, RequestStartScan));
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp17_;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = r;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = _tmp18_->job;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _scan_job_ref0 (_tmp19_);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp20_);
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8375 "scanner.c"
+#line 8520 "scanner.c"
 		} else {
-			Request* _tmp21_;
-#line 784 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			Request* _tmp21_ = NULL;
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = request;
-#line 784 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_REQUEST_CANCEL)) {
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
-#line 8384 "scanner.c"
+#line 8529 "scanner.c"
 			} else {
-				Request* _tmp22_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				Request* _tmp22_ = NULL;
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = request;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_REQUEST_QUIT)) {
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_close_device (self);
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = FALSE;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_request_unref0 (request);
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8399 "scanner.c"
+#line 8544 "scanner.c"
 				}
 			}
 		}
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8405 "scanner.c"
+#line 8550 "scanner.c"
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8413 "scanner.c"
+#line 8558 "scanner.c"
 }
 
 
 static void scanner_do_open (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	ScanJob* _tmp4_;
-	const gchar* _tmp5_;
-	gboolean _tmp7_;
-	ScanJob* _tmp11_;
-	const gchar* _tmp12_;
-	gboolean _tmp14_;
-	GHashFunc _tmp19_;
-	GEqualFunc _tmp20_;
-	GHashTable* _tmp21_;
-	ScanJob* _tmp22_;
-	const gchar* _tmp23_;
+	ScanJob* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	ScanJob* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	GHashFunc _tmp19_ = NULL;
+	GEqualFunc _tmp20_ = NULL;
+	GHashTable* _tmp21_ = NULL;
+	SANE_Status status = 0;
+	ScanJob* _tmp22_ = NULL;
+	const gchar* _tmp23_ = NULL;
 	SANE_Handle _tmp24_ = {0};
 	SANE_Status _tmp25_ = 0;
-	SANE_Status status;
-	ScanJob* _tmp26_;
-	const gchar* _tmp27_;
-	SANE_Status _tmp28_;
+	ScanJob* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
+	SANE_Status _tmp28_ = 0;
 	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_;
-	SANE_Status _tmp31_;
-	ScanJob* _tmp36_;
-	const gchar* _tmp37_;
-	gchar* _tmp38_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp30_ = NULL;
+	SANE_Status _tmp31_ = 0;
+	ScanJob* _tmp36_ = NULL;
+	const gchar* _tmp37_ = NULL;
+	gchar* _tmp38_ = NULL;
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->page_number = 0;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notified_page = -1;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = (SANE_Int) 0;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = job;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->device;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8472 "scanner.c"
-		const gchar* _tmp6_;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8617 "scanner.c"
+		const gchar* _tmp6_ = NULL;
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8478 "scanner.c"
+#line 8623 "scanner.c"
 	} else {
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8482 "scanner.c"
+#line 8627 "scanner.c"
 	}
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp3_;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 8488 "scanner.c"
-		ScanJob* _tmp8_;
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8633 "scanner.c"
+		ScanJob* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		gchar* _tmp10_ = NULL;
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = job;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->default_device;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = g_strdup (_tmp9_);
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_->device);
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_->device = _tmp10_;
-#line 8502 "scanner.c"
+#line 8647 "scanner.c"
 	}
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = job;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->device;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp12_ == NULL) {
-#line 8510 "scanner.c"
+#line 8655 "scanner.c"
 		const gchar* _tmp13_ = NULL;
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:811: No scan device available");
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:837: No scan device available");
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = _ ("No scanners available.  Please connect a scanner.");
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, 0, _tmp13_);
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8522 "scanner.c"
+#line 8667 "scanner.c"
 	}
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = self->priv->have_handle;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp14_) {
-#line 8528 "scanner.c"
-		const gchar* _tmp15_;
-		ScanJob* _tmp16_;
-		const gchar* _tmp17_;
-		SANE_Handle _tmp18_;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8673 "scanner.c"
+		const gchar* _tmp15_ = NULL;
+		ScanJob* _tmp16_ = NULL;
+		const gchar* _tmp17_ = NULL;
+		SANE_Handle _tmp18_ = {0};
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->current_device;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = job;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = _tmp16_->device;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp15_, _tmp17_) == 0) {
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->state = SCAN_STATE_GET_OPTION;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8547 "scanner.c"
+#line 8692 "scanner.c"
 		}
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = self->priv->handle;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp18_);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:828: sane_close ()");
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:854: sane_close ()");
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8557 "scanner.c"
+#line 8702 "scanner.c"
 	}
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = NULL;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = FALSE;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = g_str_hash;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = g_str_equal;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, NULL);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->options = _tmp21_;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = job;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_->device;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = sane_open (_tmp23_, &_tmp24_);
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->handle = _tmp24_;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp25_;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = job;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = _tmp26_->device;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = status;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = sane_status_to_string (_tmp28_);
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = _tmp29_;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:837: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp30_);
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = status;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp31_ != SANE_STATUS_GOOD) {
-#line 8603 "scanner.c"
-		SANE_Status _tmp32_;
+#line 8748 "scanner.c"
+		SANE_Status _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
-		SANE_Status _tmp34_;
+		SANE_Status _tmp34_ = 0;
 		const gchar* _tmp35_ = NULL;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = status;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = sane_strstatus (_tmp32_);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:841: Unable to get open device: %s", _tmp33_);
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp33_);
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = status;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _ ("Unable to connect to scanner");
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp34_, _tmp35_);
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8624 "scanner.c"
+#line 8769 "scanner.c"
 	}
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = job;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = _tmp36_->device;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = g_strdup (_tmp37_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = _tmp38_;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8642 "scanner.c"
+#line 8787 "scanner.c"
 }
 
 
 static void scanner_do_get_option (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
-	SANE_Handle _tmp3_;
-	SANE_Int _tmp4_;
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
+	SANE_Option_Descriptor* option = NULL;
+	SANE_Handle _tmp3_ = {0};
+	SANE_Int _tmp4_ = {0};
 	SANE_Option_Descriptor* _tmp5_ = NULL;
-	SANE_Option_Descriptor* option;
-	SANE_Int _tmp6_;
-	SANE_Int _tmp7_;
-	SANE_Int index;
-	SANE_Int _tmp8_;
-	SANE_Option_Descriptor* _tmp9_;
-	SANE_Int _tmp373_;
-	SANE_Option_Descriptor* _tmp374_;
-	SANE_Option_Descriptor* _tmp375_;
-	SANE_Value_Type _tmp376_;
-	SANE_Option_Descriptor* _tmp377_;
-	SANE_Int _tmp378_;
-	SANE_Option_Descriptor* _tmp379_;
-	const gchar* _tmp380_;
-	GHashTable* _tmp381_;
-	SANE_Option_Descriptor* _tmp382_;
-	const gchar* _tmp383_;
-	gchar* _tmp384_;
-	SANE_Int _tmp385_;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	SANE_Int _tmp6_ = {0};
+	SANE_Int index = {0};
+	SANE_Int _tmp7_ = {0};
+	SANE_Int _tmp8_ = {0};
+	SANE_Option_Descriptor* _tmp9_ = NULL;
+	SANE_Int _tmp355_ = {0};
+	SANE_Option_Descriptor* _tmp356_ = NULL;
+	SANE_Option_Descriptor* _tmp357_ = NULL;
+	SANE_Value_Type _tmp358_ = 0;
+	SANE_Option_Descriptor* _tmp359_ = NULL;
+	SANE_Int _tmp360_ = {0};
+	SANE_Option_Descriptor* _tmp361_ = NULL;
+	const gchar* _tmp362_ = NULL;
+	GHashTable* _tmp363_ = NULL;
+	SANE_Option_Descriptor* _tmp364_ = NULL;
+	const gchar* _tmp365_ = NULL;
+	gchar* _tmp366_ = NULL;
+	SANE_Int _tmp367_ = {0};
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->handle;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->option_index;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	option = _tmp5_;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->option_index;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:858: sane_get_option_descriptor (%d)", (gint) _tmp6_);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:884: sane_get_option_descriptor (%d)", (gint) _tmp6_);
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->option_index;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	index = _tmp7_;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->option_index;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = _tmp8_ + 1;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = option;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8707 "scanner.c"
-		SANE_Handle _tmp10_;
-		const gchar* _tmp11_;
+#line 8852 "scanner.c"
+		SANE_Handle _tmp10_ = {0};
+		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
-		SANE_Option_Descriptor* _tmp14_;
-		SANE_Option_Descriptor* _tmp18_;
-		SANE_Handle _tmp93_;
-		const gchar* _tmp94_;
+		SANE_Option_Descriptor* _tmp14_ = NULL;
+		SANE_Option_Descriptor* _tmp18_ = NULL;
+		SANE_Handle _tmp93_ = {0};
+		const gchar* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
 		SANE_Option_Descriptor* _tmp96_ = NULL;
-		SANE_Option_Descriptor* _tmp97_;
-		SANE_Handle _tmp153_;
+		SANE_Option_Descriptor* _tmp97_ = NULL;
+		SANE_Handle _tmp153_ = {0};
 		gint _tmp154_ = 0;
 		SANE_Option_Descriptor* _tmp155_ = NULL;
-		SANE_Option_Descriptor* _tmp156_;
-		SANE_Handle _tmp164_;
+		SANE_Option_Descriptor* _tmp156_ = NULL;
+		SANE_Handle _tmp164_ = {0};
 		gint _tmp165_ = 0;
 		SANE_Option_Descriptor* _tmp166_ = NULL;
-		SANE_Option_Descriptor* _tmp167_;
-		SANE_Handle _tmp175_;
+		SANE_Option_Descriptor* _tmp167_ = NULL;
+		SANE_Handle _tmp175_ = {0};
 		gint _tmp176_ = 0;
 		SANE_Option_Descriptor* _tmp177_ = NULL;
-		SANE_Option_Descriptor* _tmp178_;
-		SANE_Handle _tmp191_;
-		const gchar* _tmp192_;
+		SANE_Option_Descriptor* _tmp178_ = NULL;
+		SANE_Handle _tmp191_ = {0};
+		const gchar* _tmp192_ = NULL;
 		gint _tmp193_ = 0;
 		SANE_Option_Descriptor* _tmp194_ = NULL;
-		SANE_Option_Descriptor* _tmp195_;
-		SANE_Handle _tmp225_;
-		const gchar* _tmp226_;
-		gint _tmp227_ = 0;
-		SANE_Option_Descriptor* _tmp228_ = NULL;
-		SANE_Option_Descriptor* _tmp229_;
-		SANE_Handle _tmp247_;
-		const gchar* _tmp248_;
-		gint _tmp249_ = 0;
-		SANE_Option_Descriptor* _tmp250_ = NULL;
-		SANE_Option_Descriptor* _tmp251_;
-		SANE_Handle _tmp269_;
-		const gchar* _tmp270_;
-		gint _tmp271_ = 0;
-		SANE_Option_Descriptor* _tmp272_ = NULL;
-		SANE_Option_Descriptor* _tmp273_;
-		SANE_Handle _tmp288_;
-		const gchar* _tmp289_;
-		gint _tmp290_ = 0;
-		SANE_Option_Descriptor* _tmp291_ = NULL;
-		SANE_Option_Descriptor* _tmp292_;
-		SANE_Handle _tmp307_;
-		const gchar* _tmp308_;
-		gint _tmp309_ = 0;
-		SANE_Option_Descriptor* _tmp310_ = NULL;
-		SANE_Option_Descriptor* _tmp311_;
-		SANE_Handle _tmp322_;
-		const gchar* _tmp323_;
-		gint _tmp324_ = 0;
-		SANE_Option_Descriptor* _tmp325_ = NULL;
-		SANE_Option_Descriptor* _tmp326_;
-		const gchar* _tmp337_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Option_Descriptor* _tmp195_ = NULL;
+		SANE_Handle _tmp215_ = {0};
+		const gchar* _tmp216_ = NULL;
+		gint _tmp217_ = 0;
+		SANE_Option_Descriptor* _tmp218_ = NULL;
+		SANE_Option_Descriptor* _tmp219_ = NULL;
+		SANE_Handle _tmp234_ = {0};
+		const gchar* _tmp235_ = NULL;
+		gint _tmp236_ = 0;
+		SANE_Option_Descriptor* _tmp237_ = NULL;
+		SANE_Option_Descriptor* _tmp238_ = NULL;
+		SANE_Handle _tmp253_ = {0};
+		const gchar* _tmp254_ = NULL;
+		gint _tmp255_ = 0;
+		SANE_Option_Descriptor* _tmp256_ = NULL;
+		gboolean _tmp257_ = FALSE;
+		SANE_Option_Descriptor* _tmp258_ = NULL;
+		gboolean _tmp261_ = FALSE;
+		SANE_Handle _tmp271_ = {0};
+		const gchar* _tmp272_ = NULL;
+		gint _tmp273_ = 0;
+		SANE_Option_Descriptor* _tmp274_ = NULL;
+		gboolean _tmp275_ = FALSE;
+		SANE_Option_Descriptor* _tmp276_ = NULL;
+		gboolean _tmp279_ = FALSE;
+		SANE_Handle _tmp289_ = {0};
+		const gchar* _tmp290_ = NULL;
+		gint _tmp291_ = 0;
+		SANE_Option_Descriptor* _tmp292_ = NULL;
+		SANE_Option_Descriptor* _tmp293_ = NULL;
+		SANE_Handle _tmp304_ = {0};
+		const gchar* _tmp305_ = NULL;
+		gint _tmp306_ = 0;
+		SANE_Option_Descriptor* _tmp307_ = NULL;
+		SANE_Option_Descriptor* _tmp308_ = NULL;
+		const gchar* _tmp319_ = NULL;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = SANE_NAME_SCAN_SOURCE;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp12_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp13_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = option;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8781 "scanner.c"
-			SANE_Handle _tmp15_;
+#line 8930 "scanner.c"
+			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_debug ("scanner.vala:869: SCAN_SOURCE not available, trying alternative \"doc-" \
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_debug ("scanner.vala:895: SCAN_SOURCE not available, trying alternative \"doc-" \
 "source\"");
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = self->priv->handle;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp16_;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8795 "scanner.c"
+#line 8944 "scanner.c"
 		}
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8801 "scanner.c"
-			gchar* _tmp19_;
+#line 8950 "scanner.c"
+			gchar** flatbed_sources = NULL;
+			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_;
-			gchar* _tmp22_;
+			gchar* _tmp21_ = NULL;
+			gchar* _tmp22_ = NULL;
 			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_;
-			gchar* _tmp25_;
-			gchar* _tmp26_;
+			gchar* _tmp24_ = NULL;
+			gchar* _tmp25_ = NULL;
+			gchar* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-			gchar* _tmp28_;
+			gchar* _tmp28_ = NULL;
 			gchar** _tmp29_ = NULL;
-			gchar** flatbed_sources;
-			gint flatbed_sources_length1;
-			gint _flatbed_sources_size_;
-			gchar* _tmp30_;
+			gint flatbed_sources_length1 = 0;
+			gint _flatbed_sources_size_ = 0;
+			gchar** adf_sources = NULL;
+			gchar* _tmp30_ = NULL;
 			const gchar* _tmp31_ = NULL;
-			gchar* _tmp32_;
-			gchar* _tmp33_;
-			gchar* _tmp34_;
-			gchar* _tmp35_;
-			gchar* _tmp36_;
+			gchar* _tmp32_ = NULL;
+			gchar* _tmp33_ = NULL;
+			gchar* _tmp34_ = NULL;
+			gchar* _tmp35_ = NULL;
+			gchar* _tmp36_ = NULL;
 			gchar** _tmp37_ = NULL;
-			gchar** adf_sources;
-			gint adf_sources_length1;
-			gint _adf_sources_size_;
-			gchar* _tmp38_;
+			gint adf_sources_length1 = 0;
+			gint _adf_sources_size_ = 0;
+			gchar** adf_front_sources = NULL;
+			gchar* _tmp38_ = NULL;
 			const gchar* _tmp39_ = NULL;
-			gchar* _tmp40_;
+			gchar* _tmp40_ = NULL;
 			gchar** _tmp41_ = NULL;
-			gchar** adf_front_sources;
-			gint adf_front_sources_length1;
-			gint _adf_front_sources_size_;
-			gchar* _tmp42_;
+			gint adf_front_sources_length1 = 0;
+			gint _adf_front_sources_size_ = 0;
+			gchar** adf_back_sources = NULL;
+			gchar* _tmp42_ = NULL;
 			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_;
+			gchar* _tmp44_ = NULL;
 			gchar** _tmp45_ = NULL;
-			gchar** adf_back_sources;
-			gint adf_back_sources_length1;
-			gint _adf_back_sources_size_;
-			gchar* _tmp46_;
+			gint adf_back_sources_length1 = 0;
+			gint _adf_back_sources_size_ = 0;
+			gchar** adf_duplex_sources = NULL;
+			gchar* _tmp46_ = NULL;
 			const gchar* _tmp47_ = NULL;
-			gchar* _tmp48_;
-			gchar* _tmp49_;
-			gchar* _tmp50_;
+			gchar* _tmp48_ = NULL;
+			gchar* _tmp49_ = NULL;
+			gchar* _tmp50_ = NULL;
 			gchar** _tmp51_ = NULL;
-			gchar** adf_duplex_sources;
-			gint adf_duplex_sources_length1;
-			gint _adf_duplex_sources_size_;
-			ScanJob* _tmp52_;
-			ScanType _tmp53_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gint adf_duplex_sources_length1 = 0;
+			gint _adf_duplex_sources_size_ = 0;
+			ScanJob* _tmp52_ = NULL;
+			ScanType _tmp53_ = 0;
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = g_strdup ("Auto");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = SANE_I18N ("Auto");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = g_strdup ("Flatbed");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = SANE_I18N ("Flatbed");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = g_strdup (_tmp23_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strdup ("FlatBed");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = g_strdup ("Normal");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = SANE_I18N ("Normal");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = g_strdup (_tmp27_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_new0 (gchar*, 7 + 1);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[0] = _tmp19_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[1] = _tmp21_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[2] = _tmp22_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[3] = _tmp24_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[4] = _tmp25_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[5] = _tmp26_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[6] = _tmp28_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = _tmp29_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources_length1 = 7;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_flatbed_sources_size_ = flatbed_sources_length1;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = g_strdup ("Automatic Document Feeder");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = g_strdup (_tmp31_);
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = g_strdup ("ADF");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = g_strdup ("ADF Simplex");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_new0 (gchar*, 6 + 1);
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[0] = _tmp30_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[1] = _tmp32_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[2] = _tmp33_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[3] = _tmp34_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[4] = _tmp35_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[5] = _tmp36_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = _tmp37_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources_length1 = 6;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_sources_size_ = adf_sources_length1;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp38_ = g_strdup ("ADF Front");
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp39_ = SANE_I18N ("ADF Front");
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = g_strdup (_tmp39_);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[0] = _tmp38_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[1] = _tmp40_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = _tmp41_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources_length1 = 2;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_front_sources_size_ = adf_front_sources_length1;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp42_ = g_strdup ("ADF Back");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp43_ = SANE_I18N ("ADF Back");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp44_ = g_strdup (_tmp43_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_ = g_new0 (gchar*, 2 + 1);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[0] = _tmp42_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[1] = _tmp44_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = _tmp45_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources_length1 = 2;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_back_sources_size_ = adf_back_sources_length1;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = g_strdup ("ADF Duplex");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = SANE_I18N ("ADF Duplex");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = g_strdup (_tmp47_);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_new0 (gchar*, 4 + 1);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[0] = _tmp46_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[1] = _tmp48_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[2] = _tmp49_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[3] = _tmp50_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = _tmp51_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources_length1 = 4;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = job;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = _tmp52_->type;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp53_) {
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 8998 "scanner.c"
+#line 9147 "scanner.c"
 				{
-					SANE_Handle _tmp54_;
-					SANE_Option_Descriptor* _tmp55_;
-					SANE_Int _tmp56_;
+					SANE_Handle _tmp54_ = {0};
+					SANE_Option_Descriptor* _tmp55_ = NULL;
+					SANE_Int _tmp56_ = {0};
 					gboolean _tmp57_ = FALSE;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp54_ = self->priv->handle;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp55_ = option;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp56_ = index;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp57_ = scanner_set_default_option (self, _tmp54_, _tmp55_, _tmp56_);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp57_) {
-#line 9014 "scanner.c"
-						SANE_Handle _tmp58_;
-						SANE_Option_Descriptor* _tmp59_;
-						SANE_Int _tmp60_;
-						gchar** _tmp61_;
-						gint _tmp61__length1;
+#line 9163 "scanner.c"
+						SANE_Handle _tmp58_ = {0};
+						SANE_Option_Descriptor* _tmp59_ = NULL;
+						SANE_Int _tmp60_ = {0};
+						gchar** _tmp61_ = NULL;
+						gint _tmp61__length1 = 0;
 						gboolean _tmp62_ = FALSE;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp58_ = self->priv->handle;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp59_ = option;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp60_ = index;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61_ = flatbed_sources;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61__length1 = flatbed_sources_length1;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp62_ = scanner_set_constrained_string_option (self, _tmp58_, _tmp59_, _tmp60_, _tmp61_, _tmp61__length1, NULL);
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp62_) {
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:920: Unable to set single page source, please file a bug");
-#line 9037 "scanner.c"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:946: Unable to set single page source, please file a bug");
+#line 9186 "scanner.c"
 						}
 					}
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9042 "scanner.c"
+#line 9191 "scanner.c"
 				}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9046 "scanner.c"
+#line 9195 "scanner.c"
 				{
-					SANE_Handle _tmp63_;
-					SANE_Option_Descriptor* _tmp64_;
-					SANE_Int _tmp65_;
-					gchar** _tmp66_;
-					gint _tmp66__length1;
+					SANE_Handle _tmp63_ = {0};
+					SANE_Option_Descriptor* _tmp64_ = NULL;
+					SANE_Int _tmp65_ = {0};
+					gchar** _tmp66_ = NULL;
+					gint _tmp66__length1 = 0;
 					gboolean _tmp67_ = FALSE;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp63_ = self->priv->handle;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp64_ = option;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp65_ = index;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66_ = adf_front_sources;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66__length1 = adf_front_sources_length1;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp67_ = scanner_set_constrained_string_option (self, _tmp63_, _tmp64_, _tmp65_, _tmp66_, _tmp66__length1, NULL);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp67_) {
-#line 9068 "scanner.c"
-						SANE_Handle _tmp68_;
-						SANE_Option_Descriptor* _tmp69_;
-						SANE_Int _tmp70_;
-						gchar** _tmp71_;
-						gint _tmp71__length1;
+#line 9217 "scanner.c"
+						SANE_Handle _tmp68_ = {0};
+						SANE_Option_Descriptor* _tmp69_ = NULL;
+						SANE_Int _tmp70_ = {0};
+						gchar** _tmp71_ = NULL;
+						gint _tmp71__length1 = 0;
 						gboolean _tmp72_ = FALSE;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp68_ = self->priv->handle;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp69_ = option;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp70_ = index;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71_ = adf_sources;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71__length1 = adf_sources_length1;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp72_ = scanner_set_constrained_string_option (self, _tmp68_, _tmp69_, _tmp70_, _tmp71_, _tmp71__length1, NULL);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp72_) {
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:925: Unable to set front ADF source, please file a bug");
-#line 9091 "scanner.c"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:951: Unable to set front ADF source, please file a bug");
+#line 9240 "scanner.c"
 						}
 					}
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9096 "scanner.c"
+#line 9245 "scanner.c"
 				}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9100 "scanner.c"
+#line 9249 "scanner.c"
 				{
-					SANE_Handle _tmp73_;
-					SANE_Option_Descriptor* _tmp74_;
-					SANE_Int _tmp75_;
-					gchar** _tmp76_;
-					gint _tmp76__length1;
+					SANE_Handle _tmp73_ = {0};
+					SANE_Option_Descriptor* _tmp74_ = NULL;
+					SANE_Int _tmp75_ = {0};
+					gchar** _tmp76_ = NULL;
+					gint _tmp76__length1 = 0;
 					gboolean _tmp77_ = FALSE;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp73_ = self->priv->handle;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp74_ = option;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp75_ = index;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76_ = adf_back_sources;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76__length1 = adf_back_sources_length1;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp77_ = scanner_set_constrained_string_option (self, _tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp76__length1, NULL);
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp77_) {
-#line 9122 "scanner.c"
-						SANE_Handle _tmp78_;
-						SANE_Option_Descriptor* _tmp79_;
-						SANE_Int _tmp80_;
-						gchar** _tmp81_;
-						gint _tmp81__length1;
+#line 9271 "scanner.c"
+						SANE_Handle _tmp78_ = {0};
+						SANE_Option_Descriptor* _tmp79_ = NULL;
+						SANE_Int _tmp80_ = {0};
+						gchar** _tmp81_ = NULL;
+						gint _tmp81__length1 = 0;
 						gboolean _tmp82_ = FALSE;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp78_ = self->priv->handle;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp79_ = option;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp80_ = index;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81_ = adf_sources;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81__length1 = adf_sources_length1;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp82_ = scanner_set_constrained_string_option (self, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp81__length1, NULL);
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp82_) {
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:930: Unable to set back ADF source, please file a bug");
-#line 9145 "scanner.c"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:956: Unable to set back ADF source, please file a bug");
+#line 9294 "scanner.c"
 						}
 					}
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9150 "scanner.c"
+#line 9299 "scanner.c"
 				}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9154 "scanner.c"
+#line 9303 "scanner.c"
 				{
-					SANE_Handle _tmp83_;
-					SANE_Option_Descriptor* _tmp84_;
-					SANE_Int _tmp85_;
-					gchar** _tmp86_;
-					gint _tmp86__length1;
+					SANE_Handle _tmp83_ = {0};
+					SANE_Option_Descriptor* _tmp84_ = NULL;
+					SANE_Int _tmp85_ = {0};
+					gchar** _tmp86_ = NULL;
+					gint _tmp86__length1 = 0;
 					gboolean _tmp87_ = FALSE;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp83_ = self->priv->handle;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = option;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp85_ = index;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = adf_duplex_sources;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86__length1 = adf_duplex_sources_length1;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = scanner_set_constrained_string_option (self, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp86__length1, NULL);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp87_) {
-#line 9176 "scanner.c"
-						SANE_Handle _tmp88_;
-						SANE_Option_Descriptor* _tmp89_;
-						SANE_Int _tmp90_;
-						gchar** _tmp91_;
-						gint _tmp91__length1;
+#line 9325 "scanner.c"
+						SANE_Handle _tmp88_ = {0};
+						SANE_Option_Descriptor* _tmp89_ = NULL;
+						SANE_Int _tmp90_ = {0};
+						gchar** _tmp91_ = NULL;
+						gint _tmp91__length1 = 0;
 						gboolean _tmp92_ = FALSE;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp88_ = self->priv->handle;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp89_ = option;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp90_ = index;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91_ = adf_sources;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91__length1 = adf_sources_length1;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp92_ = scanner_set_constrained_string_option (self, _tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp91__length1, NULL);
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp92_) {
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:935: Unable to set duplex ADF source, please file a bug");
-#line 9199 "scanner.c"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:961: Unable to set duplex ADF source, please file a bug");
+#line 9348 "scanner.c"
 						}
 					}
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9204 "scanner.c"
+#line 9353 "scanner.c"
 				}
 				default:
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9209 "scanner.c"
+#line 9358 "scanner.c"
 			}
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = (_vala_array_free (adf_back_sources, adf_back_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = (_vala_array_free (adf_front_sources, adf_front_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9221 "scanner.c"
+#line 9370 "scanner.c"
 		}
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp93_ = self->priv->handle;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp94_ = SANE_NAME_SCAN_MODE;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = scanner_get_option_by_name (self, _tmp93_, _tmp94_, &_tmp95_);
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp95_;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp96_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp97_ = option;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp97_ != NULL) {
-#line 9237 "scanner.c"
-			const gchar* _tmp98_;
-			gchar* _tmp99_;
-			gchar* _tmp100_;
-			gchar* _tmp101_;
-			gchar* _tmp102_;
+#line 9386 "scanner.c"
+			gchar** color_scan_modes = NULL;
+			const gchar* _tmp98_ = NULL;
+			gchar* _tmp99_ = NULL;
+			gchar* _tmp100_ = NULL;
+			gchar* _tmp101_ = NULL;
+			gchar* _tmp102_ = NULL;
 			gchar** _tmp103_ = NULL;
-			gchar** color_scan_modes;
-			gint color_scan_modes_length1;
-			gint _color_scan_modes_size_;
-			const gchar* _tmp104_;
-			gchar* _tmp105_;
-			gchar* _tmp106_;
-			gchar* _tmp107_;
+			gint color_scan_modes_length1 = 0;
+			gint _color_scan_modes_size_ = 0;
+			gchar** gray_scan_modes = NULL;
+			const gchar* _tmp104_ = NULL;
+			gchar* _tmp105_ = NULL;
+			gchar* _tmp106_ = NULL;
+			gchar* _tmp107_ = NULL;
 			const gchar* _tmp108_ = NULL;
-			gchar* _tmp109_;
-			gchar* _tmp110_;
-			gchar* _tmp111_;
+			gchar* _tmp109_ = NULL;
+			gchar* _tmp110_ = NULL;
+			gchar* _tmp111_ = NULL;
 			gchar** _tmp112_ = NULL;
-			gchar** gray_scan_modes;
-			gint gray_scan_modes_length1;
-			gint _gray_scan_modes_size_;
-			const gchar* _tmp113_;
-			gchar* _tmp114_;
-			gchar* _tmp115_;
-			gchar* _tmp116_;
+			gint gray_scan_modes_length1 = 0;
+			gint _gray_scan_modes_size_ = 0;
+			gchar** lineart_scan_modes = NULL;
+			const gchar* _tmp113_ = NULL;
+			gchar* _tmp114_ = NULL;
+			gchar* _tmp115_ = NULL;
+			gchar* _tmp116_ = NULL;
 			const gchar* _tmp117_ = NULL;
-			gchar* _tmp118_;
-			gchar* _tmp119_;
+			gchar* _tmp118_ = NULL;
+			gchar* _tmp119_ = NULL;
 			const gchar* _tmp120_ = NULL;
-			gchar* _tmp121_;
-			gchar* _tmp122_;
+			gchar* _tmp121_ = NULL;
+			gchar* _tmp122_ = NULL;
 			const gchar* _tmp123_ = NULL;
-			gchar* _tmp124_;
-			gchar* _tmp125_;
-			const gchar* _tmp126_;
-			gchar* _tmp127_;
-			gchar* _tmp128_;
-			gchar* _tmp129_;
+			gchar* _tmp124_ = NULL;
+			gchar* _tmp125_ = NULL;
+			const gchar* _tmp126_ = NULL;
+			gchar* _tmp127_ = NULL;
+			gchar* _tmp128_ = NULL;
+			gchar* _tmp129_ = NULL;
 			const gchar* _tmp130_ = NULL;
-			gchar* _tmp131_;
-			gchar* _tmp132_;
-			gchar* _tmp133_;
-			gchar* _tmp134_;
+			gchar* _tmp131_ = NULL;
+			gchar* _tmp132_ = NULL;
+			gchar* _tmp133_ = NULL;
+			gchar* _tmp134_ = NULL;
 			gchar** _tmp135_ = NULL;
-			gchar** lineart_scan_modes;
-			gint lineart_scan_modes_length1;
-			gint _lineart_scan_modes_size_;
-			ScanJob* _tmp136_;
-			ScanMode _tmp137_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gint lineart_scan_modes_length1 = 0;
+			gint _lineart_scan_modes_size_ = 0;
+			ScanJob* _tmp136_ = NULL;
+			ScanMode _tmp137_ = 0;
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp98_ = SANE_VALUE_SCAN_MODE_COLOR;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp99_ = g_strdup (_tmp98_);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = g_strdup ("Color");
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = g_strdup ("24bit Color");
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = g_strdup ("Color - 16 Million Colors");
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = g_new0 (gchar*, 4 + 1);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[0] = _tmp99_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[1] = _tmp100_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[2] = _tmp101_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[3] = _tmp102_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = _tmp103_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes_length1 = 4;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_color_scan_modes_size_ = color_scan_modes_length1;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = g_strdup (_tmp104_);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = g_strdup ("Gray");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = g_strdup ("Grayscale");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = SANE_I18N ("Grayscale");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = g_strdup (_tmp108_);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = g_strdup ("True Gray");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = g_strdup ("Grayscale - 256 Levels");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_ = g_new0 (gchar*, 6 + 1);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[0] = _tmp105_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[1] = _tmp106_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[2] = _tmp107_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[3] = _tmp109_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[4] = _tmp110_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[5] = _tmp111_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = _tmp112_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes_length1 = 6;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_gray_scan_modes_size_ = gray_scan_modes_length1;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = SANE_VALUE_SCAN_MODE_LINEART;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = g_strdup (_tmp113_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_ = g_strdup ("Lineart");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp116_ = g_strdup ("LineArt");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp117_ = SANE_I18N ("LineArt");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp118_ = g_strdup (_tmp117_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp119_ = g_strdup ("Black & White");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp120_ = SANE_I18N ("Black & White");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp121_ = g_strdup (_tmp120_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp122_ = g_strdup ("Binary");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp123_ = SANE_I18N ("Binary");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp124_ = g_strdup (_tmp123_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp125_ = g_strdup ("Thresholded");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strdup (_tmp126_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strdup ("Gray");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = g_strdup ("Grayscale");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = SANE_I18N ("Grayscale");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp131_ = g_strdup (_tmp130_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp132_ = g_strdup ("True Gray");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp133_ = g_strdup ("Black and White - Line Art");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp134_ = g_strdup ("Black and White - Halftone");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_ = g_new0 (gchar*, 16 + 1);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[0] = _tmp114_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[1] = _tmp115_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[2] = _tmp116_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[3] = _tmp118_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[4] = _tmp119_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[5] = _tmp121_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[6] = _tmp122_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[7] = _tmp124_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[8] = _tmp125_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[9] = _tmp127_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[10] = _tmp128_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[11] = _tmp129_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[12] = _tmp131_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[13] = _tmp132_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[14] = _tmp133_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[15] = _tmp134_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = _tmp135_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes_length1 = 16;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp136_ = job;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp137_ = _tmp136_->scan_mode;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp137_) {
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9441 "scanner.c"
+#line 9590 "scanner.c"
 				{
-					SANE_Handle _tmp138_;
-					SANE_Option_Descriptor* _tmp139_;
-					SANE_Int _tmp140_;
-					gchar** _tmp141_;
-					gint _tmp141__length1;
+					SANE_Handle _tmp138_ = {0};
+					SANE_Option_Descriptor* _tmp139_ = NULL;
+					SANE_Int _tmp140_ = {0};
+					gchar** _tmp141_ = NULL;
+					gint _tmp141__length1 = 0;
 					gboolean _tmp142_ = FALSE;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp138_ = self->priv->handle;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp139_ = option;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp140_ = index;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141_ = color_scan_modes;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141__length1 = color_scan_modes_length1;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp142_ = scanner_set_constrained_string_option (self, _tmp138_, _tmp139_, _tmp140_, _tmp141_, _tmp141__length1, NULL);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp142_) {
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:985: Unable to set Color mode, please file a bug");
-#line 9465 "scanner.c"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1011: Unable to set Color mode, please file a bug");
+#line 9614 "scanner.c"
 					}
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9469 "scanner.c"
+#line 9618 "scanner.c"
 				}
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9473 "scanner.c"
+#line 9622 "scanner.c"
 				{
-					SANE_Handle _tmp143_;
-					SANE_Option_Descriptor* _tmp144_;
-					SANE_Int _tmp145_;
-					gchar** _tmp146_;
-					gint _tmp146__length1;
+					SANE_Handle _tmp143_ = {0};
+					SANE_Option_Descriptor* _tmp144_ = NULL;
+					SANE_Int _tmp145_ = {0};
+					gchar** _tmp146_ = NULL;
+					gint _tmp146__length1 = 0;
 					gboolean _tmp147_ = FALSE;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp143_ = self->priv->handle;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144_ = option;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp145_ = index;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146_ = gray_scan_modes;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146__length1 = gray_scan_modes_length1;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp147_ = scanner_set_constrained_string_option (self, _tmp143_, _tmp144_, _tmp145_, _tmp146_, _tmp146__length1, NULL);
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp147_) {
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:989: Unable to set Gray mode, please file a bug");
-#line 9497 "scanner.c"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1015: Unable to set Gray mode, please file a bug");
+#line 9646 "scanner.c"
 					}
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9501 "scanner.c"
+#line 9650 "scanner.c"
 				}
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9505 "scanner.c"
+#line 9654 "scanner.c"
 				{
-					SANE_Handle _tmp148_;
-					SANE_Option_Descriptor* _tmp149_;
-					SANE_Int _tmp150_;
-					gchar** _tmp151_;
-					gint _tmp151__length1;
+					SANE_Handle _tmp148_ = {0};
+					SANE_Option_Descriptor* _tmp149_ = NULL;
+					SANE_Int _tmp150_ = {0};
+					gchar** _tmp151_ = NULL;
+					gint _tmp151__length1 = 0;
 					gboolean _tmp152_ = FALSE;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp148_ = self->priv->handle;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149_ = option;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp150_ = index;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151_ = lineart_scan_modes;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151__length1 = lineart_scan_modes_length1;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp152_ = scanner_set_constrained_string_option (self, _tmp148_, _tmp149_, _tmp150_, _tmp151_, _tmp151__length1, NULL);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp152_) {
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:993: Unable to set Lineart mode, please file a bug");
-#line 9529 "scanner.c"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1019: Unable to set Lineart mode, please file a bug");
+#line 9678 "scanner.c"
 					}
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9533 "scanner.c"
+#line 9682 "scanner.c"
 				}
 				default:
 				{
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9539 "scanner.c"
+#line 9688 "scanner.c"
 				}
 			}
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = (_vala_array_free (lineart_scan_modes, lineart_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 9548 "scanner.c"
+#line 9697 "scanner.c"
 		}
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = self->priv->handle;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = scanner_get_option_by_name (self, _tmp153_, "duplex", &_tmp154_);
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp154_;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp155_;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = option;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp156_ != NULL) {
-#line 9562 "scanner.c"
-			SANE_Option_Descriptor* _tmp157_;
-			SANE_Value_Type _tmp158_;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9711 "scanner.c"
+			SANE_Option_Descriptor* _tmp157_ = NULL;
+			SANE_Value_Type _tmp158_ = 0;
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = option;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = _tmp157_->type;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp158_ == SANE_TYPE_BOOL) {
-#line 9571 "scanner.c"
-				SANE_Handle _tmp159_;
-				SANE_Option_Descriptor* _tmp160_;
-				SANE_Int _tmp161_;
-				ScanJob* _tmp162_;
-				ScanType _tmp163_;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9720 "scanner.c"
+				SANE_Handle _tmp159_ = {0};
+				SANE_Option_Descriptor* _tmp160_ = NULL;
+				SANE_Int _tmp161_ = {0};
+				ScanJob* _tmp162_ = NULL;
+				ScanType _tmp163_ = 0;
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp159_ = self->priv->handle;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp160_ = option;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp161_ = index;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp162_ = job;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = _tmp162_->type;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp159_, _tmp160_, _tmp161_, _tmp163_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9589 "scanner.c"
+#line 9738 "scanner.c"
 			}
 		}
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp164_ = self->priv->handle;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp166_ = scanner_get_option_by_name (self, _tmp164_, "batch-scan", &_tmp165_);
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp165_;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp166_;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp167_ = option;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp167_ != NULL) {
-#line 9604 "scanner.c"
-			SANE_Option_Descriptor* _tmp168_;
-			SANE_Value_Type _tmp169_;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9753 "scanner.c"
+			SANE_Option_Descriptor* _tmp168_ = NULL;
+			SANE_Value_Type _tmp169_ = 0;
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp168_ = option;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = _tmp168_->type;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp169_ == SANE_TYPE_BOOL) {
-#line 9613 "scanner.c"
-				SANE_Handle _tmp170_;
-				SANE_Option_Descriptor* _tmp171_;
-				SANE_Int _tmp172_;
-				ScanJob* _tmp173_;
-				ScanType _tmp174_;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9762 "scanner.c"
+				SANE_Handle _tmp170_ = {0};
+				SANE_Option_Descriptor* _tmp171_ = NULL;
+				SANE_Int _tmp172_ = {0};
+				ScanJob* _tmp173_ = NULL;
+				ScanType _tmp174_ = 0;
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp170_ = self->priv->handle;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp171_ = option;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp172_ = index;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = job;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp174_ = _tmp173_->type;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp170_, _tmp171_, _tmp172_, _tmp174_ != SCAN_TYPE_SINGLE, NULL);
-#line 9631 "scanner.c"
+#line 9780 "scanner.c"
 			}
 		}
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = self->priv->handle;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp177_ = scanner_get_option_by_name (self, _tmp175_, "compression", &_tmp176_);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp176_;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp177_;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp178_ = option;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp178_ != NULL) {
-#line 9646 "scanner.c"
+#line 9795 "scanner.c"
+			gchar** disable_compression_names = NULL;
 			const gchar* _tmp179_ = NULL;
-			gchar* _tmp180_;
+			gchar* _tmp180_ = NULL;
 			const gchar* _tmp181_ = NULL;
-			gchar* _tmp182_;
-			gchar* _tmp183_;
-			gchar* _tmp184_;
+			gchar* _tmp182_ = NULL;
+			gchar* _tmp183_ = NULL;
+			gchar* _tmp184_ = NULL;
 			gchar** _tmp185_ = NULL;
-			gchar** disable_compression_names;
-			gint disable_compression_names_length1;
-			gint _disable_compression_names_size_;
-			SANE_Handle _tmp186_;
-			SANE_Option_Descriptor* _tmp187_;
-			SANE_Int _tmp188_;
-			gchar** _tmp189_;
-			gint _tmp189__length1;
+			gint disable_compression_names_length1 = 0;
+			gint _disable_compression_names_size_ = 0;
+			SANE_Handle _tmp186_ = {0};
+			SANE_Option_Descriptor* _tmp187_ = NULL;
+			SANE_Int _tmp188_ = {0};
+			gchar** _tmp189_ = NULL;
+			gint _tmp189__length1 = 0;
 			gboolean _tmp190_ = FALSE;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = SANE_I18N ("None");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp180_ = g_strdup (_tmp179_);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = SANE_I18N ("none");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = g_strdup (_tmp181_);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = g_strdup ("None");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp184_ = g_strdup ("none");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = g_new0 (gchar*, 4 + 1);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[0] = _tmp180_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[1] = _tmp182_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[2] = _tmp183_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[3] = _tmp184_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = _tmp185_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names_length1 = 4;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_disable_compression_names_size_ = disable_compression_names_length1;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = self->priv->handle;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = option;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = index;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = disable_compression_names;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189__length1 = disable_compression_names_length1;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = scanner_set_constrained_string_option (self, _tmp186_, _tmp187_, _tmp188_, _tmp189_, _tmp189__length1, NULL);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp190_) {
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				g_warning ("scanner.vala:1029: Unable to disable compression, please file a bug");
-#line 9707 "scanner.c"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				g_warning ("scanner.vala:1055: Unable to disable compression, please file a bug");
+#line 9856 "scanner.c"
 			}
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
-#line 9711 "scanner.c"
+#line 9860 "scanner.c"
 		}
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp191_ = self->priv->handle;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp192_ = SANE_NAME_SCAN_RESOLUTION;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = scanner_get_option_by_name (self, _tmp191_, _tmp192_, &_tmp193_);
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp193_;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp194_;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp195_ = option;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp195_ != NULL) {
-#line 9727 "scanner.c"
-			SANE_Option_Descriptor* _tmp196_;
-			SANE_Value_Type _tmp197_;
-			SANE_Handle _tmp213_;
-			const gchar* _tmp214_;
-			gint _tmp215_ = 0;
-			SANE_Option_Descriptor* _tmp216_ = NULL;
-			SANE_Option_Descriptor* _tmp217_;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp196_ = option;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp197_ = _tmp196_->type;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp197_ == SANE_TYPE_FIXED) {
-#line 9741 "scanner.c"
-				SANE_Handle _tmp198_;
-				SANE_Option_Descriptor* _tmp199_;
-				SANE_Int _tmp200_;
-				ScanJob* _tmp201_;
-				gdouble _tmp202_;
-				ScanJob* _tmp203_;
-				gdouble _tmp204_ = 0.0;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp198_ = self->priv->handle;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp199_ = option;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp200_ = index;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp201_ = job;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp202_ = _tmp201_->dpi;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp203_ = job;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_fixed_option (self, _tmp198_, _tmp199_, _tmp200_, _tmp202_, &_tmp204_);
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp203_->dpi = _tmp204_;
-#line 9765 "scanner.c"
-			} else {
-				gint dpi = 0;
-				SANE_Handle _tmp205_;
-				SANE_Option_Descriptor* _tmp206_;
-				SANE_Int _tmp207_;
-				ScanJob* _tmp208_;
-				gdouble _tmp209_;
-				gint _tmp210_ = 0;
-				ScanJob* _tmp211_;
-				gint _tmp212_;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp205_ = self->priv->handle;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp206_ = option;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp207_ = index;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp208_ = job;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp209_ = _tmp208_->dpi;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp205_, _tmp206_, _tmp207_, (gint) _tmp209_, &_tmp210_);
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				dpi = _tmp210_;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp211_ = job;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp212_ = dpi;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp211_->dpi = (gdouble) _tmp212_;
-#line 9796 "scanner.c"
-			}
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp213_ = self->priv->handle;
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp214_ = SANE_NAME_BIT_DEPTH;
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp216_ = scanner_get_option_by_name (self, _tmp213_, _tmp214_, &_tmp215_);
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp215_;
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp216_;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp217_ = option;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp217_ != NULL) {
-#line 9812 "scanner.c"
-				ScanJob* _tmp218_;
-				gint _tmp219_;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp218_ = job;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp219_ = _tmp218_->depth;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp219_ > 0) {
-#line 9821 "scanner.c"
-					SANE_Handle _tmp220_;
-					SANE_Option_Descriptor* _tmp221_;
-					SANE_Int _tmp222_;
-					ScanJob* _tmp223_;
-					gint _tmp224_;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp220_ = self->priv->handle;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp221_ = option;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp222_ = index;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp223_ = job;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp224_ = _tmp223_->depth;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp220_, _tmp221_, _tmp222_, _tmp224_, NULL);
-#line 9839 "scanner.c"
-				}
-			}
-		}
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp225_ = self->priv->handle;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp226_ = SANE_NAME_SCAN_BR_X;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp228_ = scanner_get_option_by_name (self, _tmp225_, _tmp226_, &_tmp227_);
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp227_;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp228_;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp229_ = option;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp229_ != NULL) {
-#line 9857 "scanner.c"
-			SANE_Option_Descriptor* _tmp230_;
-			SANE_Constraint_Type _tmp231_;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp230_ = option;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp231_ = _tmp230_->constraint_type;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp231_ == SANE_CONSTRAINT_RANGE) {
-#line 9866 "scanner.c"
-				SANE_Option_Descriptor* _tmp232_;
-				SANE_Value_Type _tmp233_;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp232_ = option;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp233_ = _tmp232_->type;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp233_ == SANE_TYPE_FIXED) {
-#line 9875 "scanner.c"
-					SANE_Handle _tmp234_;
-					SANE_Option_Descriptor* _tmp235_;
-					SANE_Int _tmp236_;
-					SANE_Option_Descriptor* _tmp237_;
-					SANE_Range* _tmp238_;
-					SANE_Word _tmp239_;
-					gdouble _tmp240_ = 0.0;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp234_ = self->priv->handle;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp235_ = option;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp236_ = index;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp237_ = option;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp238_ = _tmp237_->constraint.range;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp239_ = _tmp238_->max;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp240_ = SANE_UNFIX ((SANE_Fixed) _tmp239_);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp234_, _tmp235_, _tmp236_, _tmp240_, NULL);
-#line 9899 "scanner.c"
-				} else {
-					SANE_Handle _tmp241_;
-					SANE_Option_Descriptor* _tmp242_;
-					SANE_Int _tmp243_;
-					SANE_Option_Descriptor* _tmp244_;
-					SANE_Range* _tmp245_;
-					SANE_Word _tmp246_;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp241_ = self->priv->handle;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp242_ = option;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp243_ = index;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp244_ = option;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp245_ = _tmp244_->constraint.range;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp246_ = _tmp245_->max;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp241_, _tmp242_, _tmp243_, (gint) _tmp246_, NULL);
-#line 9921 "scanner.c"
-				}
-			}
-		}
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp247_ = self->priv->handle;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp248_ = SANE_NAME_SCAN_BR_Y;
+#line 9876 "scanner.c"
+			SANE_Handle _tmp196_ = {0};
+			SANE_Option_Descriptor* _tmp197_ = NULL;
+			SANE_Int _tmp198_ = {0};
+			ScanJob* _tmp199_ = NULL;
+			gdouble _tmp200_ = 0.0;
+			ScanJob* _tmp201_ = NULL;
+			gdouble _tmp202_ = 0.0;
+			SANE_Handle _tmp203_ = {0};
+			const gchar* _tmp204_ = NULL;
+			gint _tmp205_ = 0;
+			SANE_Option_Descriptor* _tmp206_ = NULL;
+			SANE_Option_Descriptor* _tmp207_ = NULL;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp196_ = self->priv->handle;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp197_ = option;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp198_ = index;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp199_ = job;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp200_ = _tmp199_->dpi;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp201_ = job;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_fixed_or_int_option (self, _tmp196_, _tmp197_, _tmp198_, _tmp200_, &_tmp202_);
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp201_->dpi = _tmp202_;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp203_ = self->priv->handle;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp204_ = SANE_NAME_BIT_DEPTH;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp206_ = scanner_get_option_by_name (self, _tmp203_, _tmp204_, &_tmp205_);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp205_;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp206_;
 #line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp250_ = scanner_get_option_by_name (self, _tmp247_, _tmp248_, &_tmp249_);
+			_tmp207_ = option;
 #line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp249_;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp250_;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp251_ = option;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp251_ != NULL) {
-#line 9939 "scanner.c"
-			SANE_Option_Descriptor* _tmp252_;
-			SANE_Constraint_Type _tmp253_;
+			if (_tmp207_ != NULL) {
+#line 9919 "scanner.c"
+				ScanJob* _tmp208_ = NULL;
+				gint _tmp209_ = 0;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp208_ = job;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp209_ = _tmp208_->depth;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp209_ > 0) {
+#line 9928 "scanner.c"
+					SANE_Handle _tmp210_ = {0};
+					SANE_Option_Descriptor* _tmp211_ = NULL;
+					SANE_Int _tmp212_ = {0};
+					ScanJob* _tmp213_ = NULL;
+					gint _tmp214_ = 0;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp252_ = option;
+					_tmp210_ = self->priv->handle;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp253_ = _tmp252_->constraint_type;
+					_tmp211_ = option;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp253_ == SANE_CONSTRAINT_RANGE) {
-#line 9948 "scanner.c"
-				SANE_Option_Descriptor* _tmp254_;
-				SANE_Value_Type _tmp255_;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp254_ = option;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp255_ = _tmp254_->type;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp255_ == SANE_TYPE_FIXED) {
-#line 9957 "scanner.c"
-					SANE_Handle _tmp256_;
-					SANE_Option_Descriptor* _tmp257_;
-					SANE_Int _tmp258_;
-					SANE_Option_Descriptor* _tmp259_;
-					SANE_Range* _tmp260_;
-					SANE_Word _tmp261_;
-					gdouble _tmp262_ = 0.0;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp256_ = self->priv->handle;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp257_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp258_ = index;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp259_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp260_ = _tmp259_->constraint.range;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp261_ = _tmp260_->max;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp262_ = SANE_UNFIX ((SANE_Fixed) _tmp261_);
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp256_, _tmp257_, _tmp258_, _tmp262_, NULL);
-#line 9981 "scanner.c"
-				} else {
-					SANE_Handle _tmp263_;
-					SANE_Option_Descriptor* _tmp264_;
-					SANE_Int _tmp265_;
-					SANE_Option_Descriptor* _tmp266_;
-					SANE_Range* _tmp267_;
-					SANE_Word _tmp268_;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp263_ = self->priv->handle;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp264_ = option;
+					_tmp212_ = index;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp213_ = job;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp214_ = _tmp213_->depth;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp210_, _tmp211_, _tmp212_, _tmp214_, NULL);
+#line 9946 "scanner.c"
+				}
+			}
+		}
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp265_ = index;
+		_tmp215_ = self->priv->handle;
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp266_ = option;
+		_tmp216_ = SANE_NAME_SCAN_BR_X;
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp267_ = _tmp266_->constraint.range;
+		_tmp218_ = scanner_get_option_by_name (self, _tmp215_, _tmp216_, &_tmp217_);
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp268_ = _tmp267_->max;
+		index = (SANE_Int) _tmp217_;
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp263_, _tmp264_, _tmp265_, (gint) _tmp268_, NULL);
-#line 10003 "scanner.c"
-				}
-			}
-		}
+		option = _tmp218_;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp219_ = option;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp219_ != NULL) {
+#line 9964 "scanner.c"
+			ScanJob* _tmp220_ = NULL;
+			gint _tmp221_ = 0;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp220_ = job;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp221_ = _tmp220_->page_width;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp221_ > 0) {
+#line 9973 "scanner.c"
+				SANE_Handle _tmp222_ = {0};
+				SANE_Option_Descriptor* _tmp223_ = NULL;
+				SANE_Int _tmp224_ = {0};
+				SANE_Option_Descriptor* _tmp225_ = NULL;
+				ScanJob* _tmp226_ = NULL;
+				gint _tmp227_ = 0;
+				ScanJob* _tmp228_ = NULL;
+				gdouble _tmp229_ = 0.0;
+				gdouble _tmp230_ = 0.0;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp269_ = self->priv->handle;
+				_tmp222_ = self->priv->handle;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp270_ = SANE_NAME_PAGE_WIDTH;
+				_tmp223_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp272_ = scanner_get_option_by_name (self, _tmp269_, _tmp270_, &_tmp271_);
+				_tmp224_ = index;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp271_;
+				_tmp225_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp272_;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp273_ = option;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp273_ != NULL) {
-#line 10021 "scanner.c"
-			ScanJob* _tmp274_;
-			gint _tmp275_;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp274_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp275_ = _tmp274_->page_width;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (((gdouble) _tmp275_) > 0.0) {
-#line 10030 "scanner.c"
-				SANE_Option_Descriptor* _tmp276_;
-				SANE_Value_Type _tmp277_;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp276_ = option;
+				_tmp226_ = job;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp227_ = _tmp226_->page_width;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp228_ = job;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp229_ = _tmp228_->dpi;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp230_ = scanner_convert_page_size (self, _tmp225_, (gdouble) _tmp227_, _tmp229_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_fixed_or_int_option (self, _tmp222_, _tmp223_, _tmp224_, _tmp230_, NULL);
+#line 10003 "scanner.c"
+			} else {
+				SANE_Handle _tmp231_ = {0};
+				SANE_Option_Descriptor* _tmp232_ = NULL;
+				SANE_Int _tmp233_ = {0};
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp231_ = self->priv->handle;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp232_ = option;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp233_ = index;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_option_to_max (self, _tmp231_, _tmp232_, _tmp233_);
+#line 10016 "scanner.c"
+			}
+		}
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp234_ = self->priv->handle;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp235_ = SANE_NAME_SCAN_BR_Y;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp237_ = scanner_get_option_by_name (self, _tmp234_, _tmp235_, &_tmp236_);
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp236_;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp237_;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp277_ = _tmp276_->type;
+		_tmp238_ = option;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp277_ == SANE_TYPE_FIXED) {
-#line 10039 "scanner.c"
-					SANE_Handle _tmp278_;
-					SANE_Option_Descriptor* _tmp279_;
-					SANE_Int _tmp280_;
-					ScanJob* _tmp281_;
-					gint _tmp282_;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp278_ = self->priv->handle;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp279_ = option;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp280_ = index;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp281_ = job;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp282_ = _tmp281_->page_width;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp278_, _tmp279_, _tmp280_, _tmp282_ / 10.0, NULL);
-#line 10057 "scanner.c"
-				} else {
-					SANE_Handle _tmp283_;
-					SANE_Option_Descriptor* _tmp284_;
-					SANE_Int _tmp285_;
-					ScanJob* _tmp286_;
-					gint _tmp287_;
+		if (_tmp238_ != NULL) {
+#line 10033 "scanner.c"
+			ScanJob* _tmp239_ = NULL;
+			gint _tmp240_ = 0;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp239_ = job;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp240_ = _tmp239_->page_height;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp240_ > 0) {
+#line 10042 "scanner.c"
+				SANE_Handle _tmp241_ = {0};
+				SANE_Option_Descriptor* _tmp242_ = NULL;
+				SANE_Int _tmp243_ = {0};
+				SANE_Option_Descriptor* _tmp244_ = NULL;
+				ScanJob* _tmp245_ = NULL;
+				gint _tmp246_ = 0;
+				ScanJob* _tmp247_ = NULL;
+				gdouble _tmp248_ = 0.0;
+				gdouble _tmp249_ = 0.0;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp283_ = self->priv->handle;
+				_tmp241_ = self->priv->handle;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp284_ = option;
+				_tmp242_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp285_ = index;
+				_tmp243_ = index;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp286_ = job;
+				_tmp244_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp287_ = _tmp286_->page_width;
+				_tmp245_ = job;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp283_, _tmp284_, _tmp285_, _tmp287_ / 10, NULL);
-#line 10076 "scanner.c"
-				}
+				_tmp246_ = _tmp245_->page_height;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp247_ = job;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp248_ = _tmp247_->dpi;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp249_ = scanner_convert_page_size (self, _tmp244_, (gdouble) _tmp246_, _tmp248_);
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_fixed_or_int_option (self, _tmp241_, _tmp242_, _tmp243_, _tmp249_, NULL);
+#line 10072 "scanner.c"
+			} else {
+				SANE_Handle _tmp250_ = {0};
+				SANE_Option_Descriptor* _tmp251_ = NULL;
+				SANE_Int _tmp252_ = {0};
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp250_ = self->priv->handle;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp251_ = option;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp252_ = index;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_option_to_max (self, _tmp250_, _tmp251_, _tmp252_);
+#line 10085 "scanner.c"
 			}
 		}
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp288_ = self->priv->handle;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp289_ = SANE_NAME_PAGE_HEIGHT;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp291_ = scanner_get_option_by_name (self, _tmp288_, _tmp289_, &_tmp290_);
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp290_;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp291_;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp292_ = option;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp292_ != NULL) {
-#line 10094 "scanner.c"
-			ScanJob* _tmp293_;
-			gint _tmp294_;
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp293_ = job;
+		_tmp253_ = self->priv->handle;
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp254_ = SANE_NAME_PAGE_WIDTH;
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp256_ = scanner_get_option_by_name (self, _tmp253_, _tmp254_, &_tmp255_);
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp294_ = _tmp293_->page_height;
+		index = (SANE_Int) _tmp255_;
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (((gdouble) _tmp294_) > 0.0) {
-#line 10103 "scanner.c"
-				SANE_Option_Descriptor* _tmp295_;
-				SANE_Value_Type _tmp296_;
+		option = _tmp256_;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp258_ = option;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp258_ != NULL) {
+#line 10102 "scanner.c"
+			ScanJob* _tmp259_ = NULL;
+			gint _tmp260_ = 0;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp259_ = job;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp260_ = _tmp259_->page_width;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp257_ = ((gdouble) _tmp260_) > 0.0;
+#line 10111 "scanner.c"
+		} else {
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp257_ = FALSE;
+#line 10115 "scanner.c"
+		}
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp261_ = _tmp257_;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp261_) {
+#line 10121 "scanner.c"
+			SANE_Handle _tmp262_ = {0};
+			SANE_Option_Descriptor* _tmp263_ = NULL;
+			SANE_Int _tmp264_ = {0};
+			SANE_Option_Descriptor* _tmp265_ = NULL;
+			ScanJob* _tmp266_ = NULL;
+			gint _tmp267_ = 0;
+			ScanJob* _tmp268_ = NULL;
+			gdouble _tmp269_ = 0.0;
+			gdouble _tmp270_ = 0.0;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp295_ = option;
+			_tmp262_ = self->priv->handle;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp296_ = _tmp295_->type;
+			_tmp263_ = option;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp296_ == SANE_TYPE_FIXED) {
-#line 10112 "scanner.c"
-					SANE_Handle _tmp297_;
-					SANE_Option_Descriptor* _tmp298_;
-					SANE_Int _tmp299_;
-					ScanJob* _tmp300_;
-					gint _tmp301_;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp297_ = self->priv->handle;
+			_tmp264_ = index;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp265_ = option;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp266_ = job;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp267_ = _tmp266_->page_width;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp268_ = job;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp269_ = _tmp268_->dpi;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp270_ = scanner_convert_page_size (self, _tmp265_, (gdouble) _tmp267_, _tmp269_);
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_fixed_or_int_option (self, _tmp262_, _tmp263_, _tmp264_, _tmp270_, NULL);
+#line 10151 "scanner.c"
+		}
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp298_ = option;
+		_tmp271_ = self->priv->handle;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp299_ = index;
+		_tmp272_ = SANE_NAME_PAGE_HEIGHT;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp300_ = job;
+		_tmp274_ = scanner_get_option_by_name (self, _tmp271_, _tmp272_, &_tmp273_);
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp301_ = _tmp300_->page_height;
+		index = (SANE_Int) _tmp273_;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp297_, _tmp298_, _tmp299_, _tmp301_ / 10.0, NULL);
-#line 10130 "scanner.c"
-				} else {
-					SANE_Handle _tmp302_;
-					SANE_Option_Descriptor* _tmp303_;
-					SANE_Int _tmp304_;
-					ScanJob* _tmp305_;
-					gint _tmp306_;
+		option = _tmp274_;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp276_ = option;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp276_ != NULL) {
+#line 10167 "scanner.c"
+			ScanJob* _tmp277_ = NULL;
+			gint _tmp278_ = 0;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp277_ = job;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp278_ = _tmp277_->page_height;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp275_ = ((gdouble) _tmp278_) > 0.0;
+#line 10176 "scanner.c"
+		} else {
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp275_ = FALSE;
+#line 10180 "scanner.c"
+		}
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp279_ = _tmp275_;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp279_) {
+#line 10186 "scanner.c"
+			SANE_Handle _tmp280_ = {0};
+			SANE_Option_Descriptor* _tmp281_ = NULL;
+			SANE_Int _tmp282_ = {0};
+			SANE_Option_Descriptor* _tmp283_ = NULL;
+			ScanJob* _tmp284_ = NULL;
+			gint _tmp285_ = 0;
+			ScanJob* _tmp286_ = NULL;
+			gdouble _tmp287_ = 0.0;
+			gdouble _tmp288_ = 0.0;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp302_ = self->priv->handle;
+			_tmp280_ = self->priv->handle;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp303_ = option;
+			_tmp281_ = option;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp304_ = index;
+			_tmp282_ = index;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp305_ = job;
+			_tmp283_ = option;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp306_ = _tmp305_->page_height;
+			_tmp284_ = job;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp302_, _tmp303_, _tmp304_, _tmp306_ / 10, NULL);
-#line 10149 "scanner.c"
-				}
-			}
+			_tmp285_ = _tmp284_->page_height;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp286_ = job;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp287_ = _tmp286_->dpi;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp288_ = scanner_convert_page_size (self, _tmp283_, (gdouble) _tmp285_, _tmp287_);
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_fixed_or_int_option (self, _tmp280_, _tmp281_, _tmp282_, _tmp288_, NULL);
+#line 10216 "scanner.c"
 		}
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp289_ = self->priv->handle;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp290_ = SANE_NAME_BRIGHTNESS;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp292_ = scanner_get_option_by_name (self, _tmp289_, _tmp290_, &_tmp291_);
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp291_;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp292_;
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp307_ = self->priv->handle;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp308_ = SANE_NAME_BRIGHTNESS;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp310_ = scanner_get_option_by_name (self, _tmp307_, _tmp308_, &_tmp309_);
+		_tmp293_ = option;
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp309_;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp310_;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp311_ = option;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp311_ != NULL) {
-#line 10167 "scanner.c"
-			ScanJob* _tmp312_;
-			gint _tmp313_;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp312_ = job;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp313_ = _tmp312_->brightness;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp313_ != 0) {
-#line 10176 "scanner.c"
-				SANE_Option_Descriptor* _tmp314_;
-				ScanJob* _tmp315_;
-				gint _tmp316_;
-				gint _tmp317_ = 0;
-				gint brightness;
-				SANE_Handle _tmp318_;
-				SANE_Option_Descriptor* _tmp319_;
-				SANE_Int _tmp320_;
-				gint _tmp321_;
+		if (_tmp293_ != NULL) {
+#line 10232 "scanner.c"
+			ScanJob* _tmp294_ = NULL;
+			gint _tmp295_ = 0;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp294_ = job;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp295_ = _tmp294_->brightness;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp295_ != 0) {
+#line 10241 "scanner.c"
+				gint brightness = 0;
+				SANE_Option_Descriptor* _tmp296_ = NULL;
+				ScanJob* _tmp297_ = NULL;
+				gint _tmp298_ = 0;
+				gint _tmp299_ = 0;
+				SANE_Handle _tmp300_ = {0};
+				SANE_Option_Descriptor* _tmp301_ = NULL;
+				SANE_Int _tmp302_ = {0};
+				gint _tmp303_ = 0;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp296_ = option;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp297_ = job;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp298_ = _tmp297_->brightness;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp299_ = scanner_scale_int (self, -100, 100, _tmp296_, _tmp298_);
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				brightness = _tmp299_;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp314_ = option;
+				_tmp300_ = self->priv->handle;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp315_ = job;
+				_tmp301_ = option;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp316_ = _tmp315_->brightness;
+				_tmp302_ = index;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp317_ = scanner_scale_int (self, -100, 100, _tmp314_, _tmp316_);
+				_tmp303_ = brightness;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				brightness = _tmp317_;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp318_ = self->priv->handle;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp319_ = option;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp320_ = index;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp321_ = brightness;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp318_, _tmp319_, _tmp320_, _tmp321_, NULL);
-#line 10206 "scanner.c"
+				scanner_set_int_option (self, _tmp300_, _tmp301_, _tmp302_, _tmp303_, NULL);
+#line 10271 "scanner.c"
 			}
 		}
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp304_ = self->priv->handle;
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp305_ = SANE_NAME_CONTRAST;
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp307_ = scanner_get_option_by_name (self, _tmp304_, _tmp305_, &_tmp306_);
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp306_;
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp307_;
 #line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp322_ = self->priv->handle;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp323_ = SANE_NAME_CONTRAST;
+		_tmp308_ = option;
 #line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp325_ = scanner_get_option_by_name (self, _tmp322_, _tmp323_, &_tmp324_);
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp324_;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp325_;
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp326_ = option;
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp326_ != NULL) {
-#line 10223 "scanner.c"
-			ScanJob* _tmp327_;
-			gint _tmp328_;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp327_ = job;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp328_ = _tmp327_->contrast;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp328_ != 0) {
-#line 10232 "scanner.c"
-				SANE_Option_Descriptor* _tmp329_;
-				ScanJob* _tmp330_;
-				gint _tmp331_;
-				gint _tmp332_ = 0;
-				gint contrast;
-				SANE_Handle _tmp333_;
-				SANE_Option_Descriptor* _tmp334_;
-				SANE_Int _tmp335_;
-				gint _tmp336_;
+		if (_tmp308_ != NULL) {
+#line 10288 "scanner.c"
+			ScanJob* _tmp309_ = NULL;
+			gint _tmp310_ = 0;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp309_ = job;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp310_ = _tmp309_->contrast;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp310_ != 0) {
+#line 10297 "scanner.c"
+				gint contrast = 0;
+				SANE_Option_Descriptor* _tmp311_ = NULL;
+				ScanJob* _tmp312_ = NULL;
+				gint _tmp313_ = 0;
+				gint _tmp314_ = 0;
+				SANE_Handle _tmp315_ = {0};
+				SANE_Option_Descriptor* _tmp316_ = NULL;
+				SANE_Int _tmp317_ = {0};
+				gint _tmp318_ = 0;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp311_ = option;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp312_ = job;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp313_ = _tmp312_->contrast;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp314_ = scanner_scale_int (self, -100, 100, _tmp311_, _tmp313_);
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				contrast = _tmp314_;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp329_ = option;
+				_tmp315_ = self->priv->handle;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp330_ = job;
+				_tmp316_ = option;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp331_ = _tmp330_->contrast;
+				_tmp317_ = index;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp332_ = scanner_scale_int (self, -100, 100, _tmp329_, _tmp331_);
+				_tmp318_ = contrast;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				contrast = _tmp332_;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp333_ = self->priv->handle;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp334_ = option;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp335_ = index;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp336_ = contrast;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp333_, _tmp334_, _tmp335_, _tmp336_, NULL);
-#line 10262 "scanner.c"
+				scanner_set_int_option (self, _tmp315_, _tmp316_, _tmp317_, _tmp318_, NULL);
+#line 10327 "scanner.c"
 			}
 		}
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp337_ = self->priv->current_device;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (g_strcmp0 (_tmp337_, "test") == 0) {
-#line 10269 "scanner.c"
-			SANE_Handle _tmp338_;
-			gint _tmp339_ = 0;
-			SANE_Option_Descriptor* _tmp340_ = NULL;
-			SANE_Option_Descriptor* _tmp341_;
-			SANE_Handle _tmp345_;
-			gint _tmp346_ = 0;
-			SANE_Option_Descriptor* _tmp347_ = NULL;
-			SANE_Option_Descriptor* _tmp348_;
-			SANE_Handle _tmp352_;
-			gint _tmp353_ = 0;
-			SANE_Option_Descriptor* _tmp354_ = NULL;
-			SANE_Option_Descriptor* _tmp355_;
-			SANE_Handle _tmp359_;
-			gint _tmp360_ = 0;
-			SANE_Option_Descriptor* _tmp361_ = NULL;
-			SANE_Option_Descriptor* _tmp362_;
-			SANE_Handle _tmp366_;
-			gint _tmp367_ = 0;
-			SANE_Option_Descriptor* _tmp368_ = NULL;
-			SANE_Option_Descriptor* _tmp369_;
-#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp338_ = self->priv->handle;
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp319_ = self->priv->current_device;
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (g_strcmp0 (_tmp319_, "test") == 0) {
+#line 10334 "scanner.c"
+			SANE_Handle _tmp320_ = {0};
+			gint _tmp321_ = 0;
+			SANE_Option_Descriptor* _tmp322_ = NULL;
+			SANE_Option_Descriptor* _tmp323_ = NULL;
+			SANE_Handle _tmp327_ = {0};
+			gint _tmp328_ = 0;
+			SANE_Option_Descriptor* _tmp329_ = NULL;
+			SANE_Option_Descriptor* _tmp330_ = NULL;
+			SANE_Handle _tmp334_ = {0};
+			gint _tmp335_ = 0;
+			SANE_Option_Descriptor* _tmp336_ = NULL;
+			SANE_Option_Descriptor* _tmp337_ = NULL;
+			SANE_Handle _tmp341_ = {0};
+			gint _tmp342_ = 0;
+			SANE_Option_Descriptor* _tmp343_ = NULL;
+			SANE_Option_Descriptor* _tmp344_ = NULL;
+			SANE_Handle _tmp348_ = {0};
+			gint _tmp349_ = 0;
+			SANE_Option_Descriptor* _tmp350_ = NULL;
+			SANE_Option_Descriptor* _tmp351_ = NULL;
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp320_ = self->priv->handle;
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp322_ = scanner_get_option_by_name (self, _tmp320_, "hand-scanner", &_tmp321_);
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp321_;
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp322_;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp340_ = scanner_get_option_by_name (self, _tmp338_, "hand-scanner", &_tmp339_);
+			_tmp323_ = option;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp339_;
-#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp340_;
+			if (_tmp323_ != NULL) {
+#line 10367 "scanner.c"
+				SANE_Handle _tmp324_ = {0};
+				SANE_Option_Descriptor* _tmp325_ = NULL;
+				SANE_Int _tmp326_ = {0};
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp324_ = self->priv->handle;
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp325_ = option;
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp341_ = option;
+				_tmp326_ = index;
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp341_ != NULL) {
-#line 10302 "scanner.c"
-				SANE_Handle _tmp342_;
-				SANE_Option_Descriptor* _tmp343_;
-				SANE_Int _tmp344_;
+				scanner_set_bool_option (self, _tmp324_, _tmp325_, _tmp326_, FALSE, NULL);
+#line 10379 "scanner.c"
+			}
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp342_ = self->priv->handle;
+			_tmp327_ = self->priv->handle;
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp343_ = option;
+			_tmp329_ = scanner_get_option_by_name (self, _tmp327_, "three-pass", &_tmp328_);
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp344_ = index;
+			index = (SANE_Int) _tmp328_;
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp342_, _tmp343_, _tmp344_, FALSE, NULL);
-#line 10314 "scanner.c"
-			}
+			option = _tmp329_;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp345_ = self->priv->handle;
+			_tmp330_ = option;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp347_ = scanner_get_option_by_name (self, _tmp345_, "three-pass", &_tmp346_);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp346_;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp347_;
+			if (_tmp330_ != NULL) {
+#line 10393 "scanner.c"
+				SANE_Handle _tmp331_ = {0};
+				SANE_Option_Descriptor* _tmp332_ = NULL;
+				SANE_Int _tmp333_ = {0};
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp331_ = self->priv->handle;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp348_ = option;
+				_tmp332_ = option;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp348_ != NULL) {
-#line 10328 "scanner.c"
-				SANE_Handle _tmp349_;
-				SANE_Option_Descriptor* _tmp350_;
-				SANE_Int _tmp351_;
+				_tmp333_ = index;
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp331_, _tmp332_, _tmp333_, FALSE, NULL);
+#line 10405 "scanner.c"
+			}
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp349_ = self->priv->handle;
+			_tmp334_ = self->priv->handle;
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp350_ = option;
+			_tmp336_ = scanner_get_option_by_name (self, _tmp334_, "test-picture", &_tmp335_);
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp351_ = index;
+			index = (SANE_Int) _tmp335_;
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp349_, _tmp350_, _tmp351_, FALSE, NULL);
-#line 10340 "scanner.c"
-			}
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp352_ = self->priv->handle;
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp354_ = scanner_get_option_by_name (self, _tmp352_, "test-picture", &_tmp353_);
+			option = _tmp336_;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp353_;
+			_tmp337_ = option;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp354_;
+			if (_tmp337_ != NULL) {
+#line 10419 "scanner.c"
+				SANE_Handle _tmp338_ = {0};
+				SANE_Option_Descriptor* _tmp339_ = NULL;
+				SANE_Int _tmp340_ = {0};
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp338_ = self->priv->handle;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp339_ = option;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp355_ = option;
+				_tmp340_ = index;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp355_ != NULL) {
-#line 10354 "scanner.c"
-				SANE_Handle _tmp356_;
-				SANE_Option_Descriptor* _tmp357_;
-				SANE_Int _tmp358_;
+				scanner_set_string_option (self, _tmp338_, _tmp339_, _tmp340_, "Color pattern", NULL);
+#line 10431 "scanner.c"
+			}
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp356_ = self->priv->handle;
+			_tmp341_ = self->priv->handle;
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp357_ = option;
+			_tmp343_ = scanner_get_option_by_name (self, _tmp341_, "read-delay", &_tmp342_);
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp358_ = index;
+			index = (SANE_Int) _tmp342_;
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_string_option (self, _tmp356_, _tmp357_, _tmp358_, "Color pattern", NULL);
-#line 10366 "scanner.c"
-			}
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp359_ = self->priv->handle;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp361_ = scanner_get_option_by_name (self, _tmp359_, "read-delay", &_tmp360_);
+			option = _tmp343_;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp360_;
+			_tmp344_ = option;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp361_;
+			if (_tmp344_ != NULL) {
+#line 10445 "scanner.c"
+				SANE_Handle _tmp345_ = {0};
+				SANE_Option_Descriptor* _tmp346_ = NULL;
+				SANE_Int _tmp347_ = {0};
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp345_ = self->priv->handle;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp346_ = option;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp362_ = option;
+				_tmp347_ = index;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp362_ != NULL) {
-#line 10380 "scanner.c"
-				SANE_Handle _tmp363_;
-				SANE_Option_Descriptor* _tmp364_;
-				SANE_Int _tmp365_;
+				scanner_set_bool_option (self, _tmp345_, _tmp346_, _tmp347_, TRUE, NULL);
+#line 10457 "scanner.c"
+			}
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp363_ = self->priv->handle;
+			_tmp348_ = self->priv->handle;
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp364_ = option;
+			_tmp350_ = scanner_get_option_by_name (self, _tmp348_, "read-delay-duration", &_tmp349_);
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp365_ = index;
+			index = (SANE_Int) _tmp349_;
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp363_, _tmp364_, _tmp365_, TRUE, NULL);
-#line 10392 "scanner.c"
-			}
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp366_ = self->priv->handle;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp368_ = scanner_get_option_by_name (self, _tmp366_, "read-delay-duration", &_tmp367_);
+			option = _tmp350_;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp367_;
+			_tmp351_ = option;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp368_;
+			if (_tmp351_ != NULL) {
+#line 10471 "scanner.c"
+				SANE_Handle _tmp352_ = {0};
+				SANE_Option_Descriptor* _tmp353_ = NULL;
+				SANE_Int _tmp354_ = {0};
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp352_ = self->priv->handle;
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp353_ = option;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp369_ = option;
+				_tmp354_ = index;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp369_ != NULL) {
-#line 10406 "scanner.c"
-				SANE_Handle _tmp370_;
-				SANE_Option_Descriptor* _tmp371_;
-				SANE_Int _tmp372_;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp370_ = self->priv->handle;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp371_ = option;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp372_ = index;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp370_, _tmp371_, _tmp372_, 200000, NULL);
-#line 10418 "scanner.c"
+				scanner_set_int_option (self, _tmp352_, _tmp353_, _tmp354_, 200000, NULL);
+#line 10483 "scanner.c"
 			}
 		}
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10427 "scanner.c"
-	}
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp373_ = index;
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp374_ = option;
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_log_option (self, _tmp373_, _tmp374_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp375_ = option;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp376_ = _tmp375_->type;
+#line 10492 "scanner.c"
+	}
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp355_ = index;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp356_ = option;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	scanner_log_option (self, _tmp355_, _tmp356_);
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp357_ = option;
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp358_ = _tmp357_->type;
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp358_ == SANE_TYPE_GROUP) {
 #line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp376_ == SANE_TYPE_GROUP) {
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10445 "scanner.c"
-	}
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp377_ = option;
+#line 10510 "scanner.c"
+	}
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp359_ = option;
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp360_ = _tmp359_->cap;
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if ((_tmp360_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
 #line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp378_ = _tmp377_->cap;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if ((_tmp378_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10457 "scanner.c"
-	}
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp379_ = option;
+#line 10522 "scanner.c"
+	}
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp361_ = option;
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp362_ = _tmp361_->name;
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp362_ == NULL) {
 #line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp380_ = _tmp379_->name;
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp380_ == NULL) {
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10469 "scanner.c"
-	}
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp381_ = self->priv->options;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp382_ = option;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp383_ = _tmp382_->name;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp384_ = g_strdup (_tmp383_);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp385_ = index;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_hash_table_insert (_tmp381_, _tmp384_, (gpointer) ((gintptr) ((gint) _tmp385_)));
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 10534 "scanner.c"
+	}
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp363_ = self->priv->options;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp364_ = option;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp365_ = _tmp364_->name;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp366_ = g_strdup (_tmp365_);
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp367_ = index;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_hash_table_insert (_tmp363_, _tmp366_, (gpointer) ((gintptr) ((gint) _tmp367_)));
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10485 "scanner.c"
+#line 10550 "scanner.c"
+}
+
+
+static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor* option, gdouble size, gdouble dpi) {
+	gdouble result = 0.0;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Unit _tmp1_ = 0;
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (self != NULL, 0.0);
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (option != NULL, 0.0);
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = option;
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = _tmp0_->unit;
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp1_ == SANE_UNIT_PIXEL) {
+#line 10568 "scanner.c"
+		gdouble _tmp2_ = 0.0;
+		gdouble _tmp3_ = 0.0;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp2_ = dpi;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp3_ = size;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		result = (_tmp2_ * _tmp3_) / 254.0;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		return result;
+#line 10579 "scanner.c"
+	} else {
+		SANE_Option_Descriptor* _tmp4_ = NULL;
+		SANE_Unit _tmp5_ = 0;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp4_ = option;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp5_ = _tmp4_->unit;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp5_ == SANE_UNIT_MM) {
+#line 10589 "scanner.c"
+			gdouble _tmp6_ = 0.0;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp6_ = size;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			result = _tmp6_ / 10.0;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			return result;
+#line 10597 "scanner.c"
+		} else {
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1165: Unable to set unsupported unit type");
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			result = (gdouble) 0.0f;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			return result;
+#line 10605 "scanner.c"
+		}
+	}
 }
 
 
 static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_Handle handle, const gchar* name, gint* index) {
 	gint _vala_index = 0;
 	SANE_Option_Descriptor* result = NULL;
-	GHashTable* _tmp0_;
-	const gchar* _tmp1_;
+	GHashTable* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gconstpointer _tmp2_ = NULL;
-	gint _tmp3_;
-	SANE_Handle _tmp4_;
-	gint _tmp5_;
+	gint _tmp3_ = 0;
+	SANE_Handle _tmp4_ = {0};
+	gint _tmp5_ = 0;
 	SANE_Option_Descriptor* _tmp6_ = NULL;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->options;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = name;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_index = (gint) ((gintptr) _tmp2_);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _vala_index;
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_ == 0) {
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (index) {
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10521 "scanner.c"
+#line 10643 "scanner.c"
 		}
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10525 "scanner.c"
+#line 10647 "scanner.c"
 	}
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _vala_index;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp6_;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (index) {
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10539 "scanner.c"
+#line 10661 "scanner.c"
 	}
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10543 "scanner.c"
+#line 10665 "scanner.c"
 }
 
 
 static void scanner_do_complete_document (Scanner* self) {
-	SANE_Handle _tmp0_;
-	GList* _tmp1_;
-	GList* _tmp2_;
-	NotifyDocumentDone* _tmp3_;
-	NotifyDocumentDone* _tmp4_;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	SANE_Handle _tmp0_ = {0};
+	GList* _tmp1_ = NULL;
+	GList* _tmp2_ = NULL;
+	NotifyDocumentDone* _tmp3_ = NULL;
+	NotifyDocumentDone* _tmp4_ = NULL;
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_cancel (_tmp0_);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1170: sane_cancel ()");
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1182: sane_cancel ()");
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_queue;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->job_queue;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_OPEN;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10575 "scanner.c"
+#line 10697 "scanner.c"
 	}
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp4_);
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp4_);
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10587 "scanner.c"
+#line 10709 "scanner.c"
 }
 
 
 static void scanner_do_start (Scanner* self) {
 	SANE_Status status = 0;
-	NotifyExpectPage* _tmp0_;
-	NotifyExpectPage* _tmp1_;
-	SANE_Handle _tmp2_;
+	NotifyExpectPage* _tmp0_ = NULL;
+	NotifyExpectPage* _tmp1_ = NULL;
+	SANE_Handle _tmp2_ = {0};
 	SANE_Status _tmp3_ = 0;
-	gint _tmp4_;
-	gint _tmp5_;
-	SANE_Status _tmp6_;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	SANE_Status _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	SANE_Status _tmp9_;
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp8_ = NULL;
+	SANE_Status _tmp9_ = 0;
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = notify_expect_page_new ();
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_;
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp1_);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp1_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->handle;
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_start (_tmp2_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp3_;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->page_number;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->pass_number;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1197: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1209: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == SANE_STATUS_GOOD) {
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10639 "scanner.c"
+#line 10761 "scanner.c"
 	} else {
-		SANE_Status _tmp10_;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Status _tmp10_ = 0;
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = status;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10648 "scanner.c"
+#line 10770 "scanner.c"
 		} else {
-			SANE_Status _tmp11_;
+			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
-			SANE_Status _tmp13_;
+			SANE_Status _tmp13_ = 0;
 			const gchar* _tmp14_ = NULL;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = status;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = sane_strstatus (_tmp11_);
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1204: Unable to start device: %s", _tmp12_);
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1216: Unable to start device: %s", _tmp12_);
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = status;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _ ("Unable to start scan");
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10666 "scanner.c"
+#line 10788 "scanner.c"
 		}
 	}
 }
@@ -10677,79 +10800,79 @@ static void scanner_do_start (Scanner* self) {
 
 static gchar* sane_frame_to_string (SANE_Frame frame) {
 	gchar* result = NULL;
-	SANE_Frame _tmp0_;
+	SANE_Frame _tmp0_ = 0;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = frame;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10681 "scanner.c"
+#line 10803 "scanner.c"
 		{
-			gchar* _tmp1_;
+			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_FRAME_GRAY");
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10690 "scanner.c"
+#line 10812 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10694 "scanner.c"
+#line 10816 "scanner.c"
 		{
-			gchar* _tmp2_;
+			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_FRAME_RGB");
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10703 "scanner.c"
+#line 10825 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10707 "scanner.c"
+#line 10829 "scanner.c"
 		{
-			gchar* _tmp3_;
+			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_FRAME_RED");
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10716 "scanner.c"
+#line 10838 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10720 "scanner.c"
+#line 10842 "scanner.c"
 		{
-			gchar* _tmp4_;
+			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_FRAME_GREEN");
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10729 "scanner.c"
+#line 10851 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10733 "scanner.c"
+#line 10855 "scanner.c"
 		{
-			gchar* _tmp5_;
+			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_FRAME_BLUE");
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10742 "scanner.c"
+#line 10864 "scanner.c"
 		}
 		default:
 		{
-			SANE_Frame _tmp6_;
+			SANE_Frame _tmp6_ = 0;
 			gchar* _tmp7_ = NULL;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = frame;
@@ -10759,1787 +10882,1787 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp7_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10756 "scanner.c"
+#line 10878 "scanner.c"
 		}
 	}
 }
 
 
 static void scanner_do_get_parameters (Scanner* self) {
-	SANE_Handle _tmp0_;
+	SANE_Status status = 0;
+	SANE_Handle _tmp0_ = {0};
 	SANE_Parameters _tmp1_ = {0};
 	SANE_Status _tmp2_ = 0;
-	SANE_Status status;
-	SANE_Status _tmp3_;
+	SANE_Status _tmp3_ = 0;
 	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_;
-	SANE_Status _tmp6_;
-	GList* _tmp11_;
-	gconstpointer _tmp12_;
-	ScanJob* _tmp13_;
-	ScanJob* job;
+	gchar* _tmp5_ = NULL;
+	SANE_Status _tmp6_ = 0;
+	ScanJob* job = NULL;
+	GList* _tmp11_ = NULL;
+	gconstpointer _tmp12_ = NULL;
+	ScanJob* _tmp13_ = NULL;
 	const gchar* _tmp14_ = NULL;
-	SANE_Parameters _tmp15_;
-	gboolean _tmp16_;
-	SANE_Parameters _tmp17_;
-	SANE_Frame _tmp18_;
+	SANE_Parameters _tmp15_ = {0};
+	gboolean _tmp16_ = FALSE;
+	SANE_Parameters _tmp17_ = {0};
+	SANE_Frame _tmp18_ = 0;
 	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_;
-	const gchar* _tmp21_;
-	SANE_Parameters _tmp22_;
-	gint _tmp23_;
-	SANE_Parameters _tmp24_;
-	gint _tmp25_;
-	SANE_Parameters _tmp26_;
-	gint _tmp27_;
-	SANE_Parameters _tmp28_;
-	gint _tmp29_;
-	ScanPageInfo* _tmp30_;
-	ScanPageInfo* info;
-	ScanPageInfo* _tmp31_;
-	SANE_Parameters _tmp32_;
-	gint _tmp33_;
-	ScanPageInfo* _tmp34_;
-	SANE_Parameters _tmp35_;
-	gint _tmp36_;
-	ScanPageInfo* _tmp37_;
-	SANE_Parameters _tmp38_;
-	gint _tmp39_;
+	gchar* _tmp20_ = NULL;
+	const gchar* _tmp21_ = NULL;
+	SANE_Parameters _tmp22_ = {0};
+	gint _tmp23_ = 0;
+	SANE_Parameters _tmp24_ = {0};
+	gint _tmp25_ = 0;
+	SANE_Parameters _tmp26_ = {0};
+	gint _tmp27_ = 0;
+	SANE_Parameters _tmp28_ = {0};
+	gint _tmp29_ = 0;
+	ScanPageInfo* info = NULL;
+	ScanPageInfo* _tmp30_ = NULL;
+	ScanPageInfo* _tmp31_ = NULL;
+	SANE_Parameters _tmp32_ = {0};
+	gint _tmp33_ = 0;
+	ScanPageInfo* _tmp34_ = NULL;
+	SANE_Parameters _tmp35_ = {0};
+	gint _tmp36_ = 0;
+	ScanPageInfo* _tmp37_ = NULL;
+	SANE_Parameters _tmp38_ = {0};
+	gint _tmp39_ = 0;
 	gboolean _tmp40_ = FALSE;
 	gboolean _tmp41_ = FALSE;
 	gboolean _tmp42_ = FALSE;
-	SANE_Parameters _tmp43_;
-	gint _tmp44_;
-	gboolean _tmp47_;
-	gboolean _tmp50_;
-	gboolean _tmp53_;
+	SANE_Parameters _tmp43_ = {0};
+	gint _tmp44_ = 0;
+	gboolean _tmp47_ = FALSE;
+	gboolean _tmp50_ = FALSE;
+	gboolean _tmp53_ = FALSE;
 	gint _tmp57_ = 0;
-	SANE_Parameters _tmp58_;
-	SANE_Frame _tmp59_;
-	ScanPageInfo* _tmp60_;
-	gint _tmp61_;
-	ScanPageInfo* _tmp62_;
-	ScanJob* _tmp63_;
-	gdouble _tmp64_;
-	ScanPageInfo* _tmp65_;
-	const gchar* _tmp66_;
-	gchar* _tmp67_;
-	gint _tmp68_;
-	gint _tmp69_;
-	SANE_Parameters _tmp76_;
-	gint _tmp77_;
-	gint buffer_size;
-	gint _tmp78_;
+	SANE_Parameters _tmp58_ = {0};
+	SANE_Frame _tmp59_ = 0;
+	ScanPageInfo* _tmp60_ = NULL;
+	gint _tmp61_ = 0;
+	ScanPageInfo* _tmp62_ = NULL;
+	ScanJob* _tmp63_ = NULL;
+	gdouble _tmp64_ = 0.0;
+	ScanPageInfo* _tmp65_ = NULL;
+	const gchar* _tmp66_ = NULL;
+	gchar* _tmp67_ = NULL;
+	gint _tmp68_ = 0;
+	gint _tmp69_ = 0;
+	gint buffer_size = 0;
+	SANE_Parameters _tmp76_ = {0};
+	gint _tmp77_ = 0;
+	gint _tmp78_ = 0;
 	guchar* _tmp79_ = NULL;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->parameters = _tmp1_;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp2_;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = status;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_status_to_string (_tmp3_);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1214: sane_get_parameters () -> %s", _tmp5_);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1226: sane_get_parameters () -> %s", _tmp5_);
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp5_);
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10852 "scanner.c"
-		SANE_Status _tmp7_;
+#line 10974 "scanner.c"
+		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
-		SANE_Status _tmp9_;
+		SANE_Status _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = status;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = sane_strstatus (_tmp7_);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1217: Unable to get device parameters: %s", _tmp8_);
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1229: Unable to get device parameters: %s", _tmp8_);
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = status;
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _ ("Error communicating with scanner");
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10871 "scanner.c"
+#line 10993 "scanner.c"
 	}
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->data;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp12_, TYPE_SCAN_JOB, ScanJob));
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp13_;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = self->priv->parameters;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_.last_frame;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp16_) {
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 10889 "scanner.c"
+#line 11011 "scanner.c"
 	} else {
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 10893 "scanner.c"
+#line 11015 "scanner.c"
 	}
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_.format;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = sane_frame_to_string (_tmp18_);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = _tmp14_;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_.bytes_per_line;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = _tmp24_.pixels_per_line;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = _tmp26_.lines;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = _tmp28_.depth;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1226: Parameters: format=%s last_frame=%s bytes_per_line=" \
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1238: Parameters: format=%s last_frame=%s bytes_per_line=" \
 "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp21_, _tmp23_, _tmp25_, _tmp27_, _tmp29_);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = scan_page_info_new ();
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	info = _tmp30_;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = info;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = self->priv->parameters;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_.pixels_per_line;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_->width = _tmp33_;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = info;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = self->priv->parameters;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_.lines;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_->height = _tmp36_;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = info;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->parameters;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp38_.depth;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_->depth = _tmp39_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = self->priv->parameters;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_.depth;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp44_ == 8) {
-#line 10959 "scanner.c"
-		SANE_Parameters _tmp45_;
-		SANE_Frame _tmp46_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11081 "scanner.c"
+		SANE_Parameters _tmp45_ = {0};
+		SANE_Frame _tmp46_ = 0;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = self->priv->parameters;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = _tmp45_.format;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp42_ = _tmp46_ == SANE_FRAME_GRAY;
-#line 10968 "scanner.c"
+#line 11090 "scanner.c"
 	} else {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp42_ = FALSE;
-#line 10972 "scanner.c"
+#line 11094 "scanner.c"
 	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = _tmp42_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp47_) {
-#line 10978 "scanner.c"
-		ScanJob* _tmp48_;
-		gint _tmp49_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11100 "scanner.c"
+		ScanJob* _tmp48_ = NULL;
+		gint _tmp49_ = 0;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp48_ = job;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp49_ = _tmp48_->depth;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp49_ == 2;
-#line 10987 "scanner.c"
+#line 11109 "scanner.c"
 	} else {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
-#line 10991 "scanner.c"
+#line 11113 "scanner.c"
 	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = _tmp41_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp50_) {
-#line 10997 "scanner.c"
-		ScanJob* _tmp51_;
-		ScanMode _tmp52_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11119 "scanner.c"
+		ScanJob* _tmp51_ = NULL;
+		ScanMode _tmp52_ = 0;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = job;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = _tmp51_->scan_mode;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp52_ == SCAN_MODE_GRAY;
-#line 11006 "scanner.c"
+#line 11128 "scanner.c"
 	} else {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
-#line 11010 "scanner.c"
+#line 11132 "scanner.c"
 	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp40_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp53_) {
-#line 11016 "scanner.c"
-		ScanPageInfo* _tmp54_;
-		ScanJob* _tmp55_;
-		gint _tmp56_;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11138 "scanner.c"
+		ScanPageInfo* _tmp54_ = NULL;
+		ScanJob* _tmp55_ = NULL;
+		gint _tmp56_ = 0;
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = info;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = job;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = _tmp55_->depth;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_->depth = _tmp56_;
-#line 11028 "scanner.c"
+#line 11150 "scanner.c"
 	}
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp58_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp59_ = _tmp58_.format;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp59_ == SANE_FRAME_GRAY) {
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = 1;
-#line 11038 "scanner.c"
+#line 11160 "scanner.c"
 	} else {
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = 3;
-#line 11042 "scanner.c"
+#line 11164 "scanner.c"
 	}
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_ = info;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp61_ = _tmp57_;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_->n_channels = _tmp61_;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_ = info;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = job;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = _tmp63_->dpi;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_->dpi = _tmp64_;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = info;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp66_ = self->priv->current_device;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp67_ = g_strdup (_tmp66_);
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp65_->device);
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_->device = _tmp67_;
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp68_ = self->priv->page_number;
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp69_ = self->priv->notified_page;
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp68_ != _tmp69_) {
-#line 11074 "scanner.c"
-		ScanJob* _tmp70_;
-		gint _tmp71_;
-		ScanPageInfo* _tmp72_;
-		NotifyGotPageInfo* _tmp73_;
-		NotifyGotPageInfo* _tmp74_;
-		gint _tmp75_;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11196 "scanner.c"
+		ScanJob* _tmp70_ = NULL;
+		gint _tmp71_ = 0;
+		ScanPageInfo* _tmp72_ = NULL;
+		NotifyGotPageInfo* _tmp73_ = NULL;
+		NotifyGotPageInfo* _tmp74_ = NULL;
+		gint _tmp75_ = 0;
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = job;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = _tmp70_->id;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = info;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = notify_got_page_info_new (_tmp71_, _tmp72_);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp74_ = _tmp73_;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp74_);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp74_);
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp75_ = self->priv->page_number;
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp75_;
-#line 11099 "scanner.c"
+#line 11221 "scanner.c"
 	}
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp76_ = self->priv->parameters;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp77_ = _tmp76_.bytes_per_line;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	buffer_size = _tmp77_ + 1;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp78_ = buffer_size;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp79_ = g_new0 (guchar, _tmp78_);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = _tmp79_;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = _tmp78_;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = 0;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_READ;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (info);
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11131 "scanner.c"
+#line 11253 "scanner.c"
 }
 
 
 static void scanner_do_complete_page (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
-	ScanJob* _tmp3_;
-	gint _tmp4_;
-	NotifyPageDone* _tmp5_;
-	NotifyPageDone* _tmp6_;
-	SANE_Parameters _tmp7_;
-	gboolean _tmp8_;
-	ScanJob* _tmp10_;
-	ScanType _tmp11_;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
+	ScanJob* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	NotifyPageDone* _tmp5_ = NULL;
+	NotifyPageDone* _tmp6_ = NULL;
+	SANE_Parameters _tmp7_ = {0};
+	gboolean _tmp8_ = FALSE;
+	ScanJob* _tmp10_ = NULL;
+	ScanType _tmp11_ = 0;
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = job;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->id;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = notify_page_done_new (_tmp4_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp6_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp6_);
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->parameters;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_.last_frame;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11176 "scanner.c"
-		gint _tmp9_;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11298 "scanner.c"
+		gint _tmp9_ = 0;
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = _tmp9_ + 1;
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11188 "scanner.c"
+#line 11310 "scanner.c"
 	}
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->type;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11196 "scanner.c"
-		gint _tmp12_;
-		ScanJob* _tmp13_;
-		gint _tmp14_;
-		NotifyPageDone* _tmp15_;
-		NotifyPageDone* _tmp16_;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11318 "scanner.c"
+		gint _tmp12_ = 0;
+		ScanJob* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
+		NotifyPageDone* _tmp15_ = NULL;
+		NotifyPageDone* _tmp16_ = NULL;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = self->priv->page_number;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->page_number = _tmp12_ + 1;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = 0;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = job;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->id;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = notify_page_done_new (_tmp14_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp16_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp16_);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11226 "scanner.c"
+#line 11348 "scanner.c"
 	}
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11232 "scanner.c"
+#line 11354 "scanner.c"
 }
 
 
 static void scanner_do_read (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
-	guchar* _tmp3_;
-	gint _tmp3__length1;
-	gint _tmp4_;
-	gint n_to_read;
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
+	gint n_to_read = 0;
+	guchar* _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	gint _tmp4_ = 0;
 	SANE_Int n_read = {0};
-	guchar* _tmp5_;
-	gint _tmp5__length1;
-	guchar* b;
-	SANE_Handle _tmp6_;
-	guchar* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
+	guchar* b = NULL;
+	guchar* _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
+	SANE_Status status = 0;
+	SANE_Handle _tmp6_ = {0};
+	guchar* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
 	SANE_Int _tmp10_ = {0};
 	SANE_Status _tmp11_ = 0;
-	SANE_Status status;
-	gint _tmp12_;
-	SANE_Status _tmp13_;
+	gint _tmp12_ = 0;
+	SANE_Status _tmp13_ = 0;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_;
-	SANE_Int _tmp16_;
-	SANE_Status _tmp17_;
-	SANE_Status _tmp30_;
-	gboolean full_read;
+	gchar* _tmp15_ = NULL;
+	SANE_Int _tmp16_ = {0};
+	SANE_Status _tmp17_ = 0;
+	SANE_Status _tmp30_ = 0;
+	gboolean full_read = FALSE;
 	gboolean _tmp35_ = FALSE;
-	gint _tmp36_;
-	gboolean _tmp39_;
-	gint _tmp40_;
-	SANE_Int _tmp41_;
-	gint _tmp42_;
-	SANE_Parameters _tmp43_;
-	gint _tmp44_;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gint _tmp36_ = 0;
+	gboolean _tmp39_ = FALSE;
+	gint _tmp40_ = 0;
+	SANE_Int _tmp41_ = {0};
+	gint _tmp42_ = 0;
+	SANE_Parameters _tmp43_ = {0};
+	gint _tmp44_ = 0;
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->buffer;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3__length1 = self->priv->buffer_length1;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->n_used;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_to_read = _tmp3__length1 - _tmp4_;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->buffer;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5__length1 = self->priv->buffer_length1;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	b = (guchar*) _tmp5_;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->handle;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = b;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->n_used;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = n_to_read;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_read = _tmp10_;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp11_;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = n_to_read;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = n_read;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1298: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1310: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = status;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11328 "scanner.c"
+#line 11450 "scanner.c"
 		gboolean _tmp18_ = FALSE;
-		SANE_Parameters _tmp19_;
-		gint _tmp20_;
-		gboolean _tmp24_;
-		gint _tmp28_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Parameters _tmp19_ = {0};
+		gint _tmp20_ = 0;
+		gboolean _tmp24_ = FALSE;
+		gint _tmp28_ = 0;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11340 "scanner.c"
-			gint _tmp21_;
-			SANE_Parameters _tmp22_;
-			gint _tmp23_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11462 "scanner.c"
+			gint _tmp21_ = 0;
+			SANE_Parameters _tmp22_ = {0};
+			gint _tmp23_ = 0;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = self->priv->line_count;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = self->priv->parameters;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = _tmp22_.lines;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11352 "scanner.c"
+#line 11474 "scanner.c"
 		} else {
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11356 "scanner.c"
+#line 11478 "scanner.c"
 		}
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp24_ = _tmp18_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp24_) {
-#line 11362 "scanner.c"
-			gint _tmp25_;
-			SANE_Parameters _tmp26_;
-			gint _tmp27_;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11484 "scanner.c"
+			gint _tmp25_ = 0;
+			SANE_Parameters _tmp26_ = {0};
+			gint _tmp27_ = 0;
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = self->priv->line_count;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = self->priv->parameters;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = _tmp26_.lines;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1304: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
-#line 11374 "scanner.c"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1316: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
+#line 11496 "scanner.c"
 		}
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp28_ = self->priv->n_used;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp28_ > 0) {
-#line 11380 "scanner.c"
-			gint _tmp29_;
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11502 "scanner.c"
+			gint _tmp29_ = 0;
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = self->priv->n_used;
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1306: Scan complete with %d bytes of unused data", _tmp29_);
-#line 11386 "scanner.c"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1318: Scan complete with %d bytes of unused data", _tmp29_);
+#line 11508 "scanner.c"
 		}
-#line 1307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11394 "scanner.c"
+#line 11516 "scanner.c"
 	}
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = status;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 11400 "scanner.c"
-		SANE_Status _tmp31_;
+#line 11522 "scanner.c"
+		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
-		SANE_Status _tmp33_;
+		SANE_Status _tmp33_ = 0;
 		const gchar* _tmp34_ = NULL;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = status;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = sane_strstatus (_tmp31_);
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1314: Unable to read frame from device: %s", _tmp32_);
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1326: Unable to read frame from device: %s", _tmp32_);
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = status;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _ ("Error communicating with scanner");
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11421 "scanner.c"
+#line 11543 "scanner.c"
 	}
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = self->priv->n_used;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp36_ == 0) {
-#line 11429 "scanner.c"
-		SANE_Int _tmp37_;
-		guchar* _tmp38_;
-		gint _tmp38__length1;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11551 "scanner.c"
+		SANE_Int _tmp37_ = {0};
+		guchar* _tmp38_ = NULL;
+		gint _tmp38__length1 = 0;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = n_read;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38_ = self->priv->buffer;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38__length1 = self->priv->buffer_length1;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _tmp37_ == ((SANE_Int) _tmp38__length1);
-#line 11441 "scanner.c"
+#line 11563 "scanner.c"
 	} else {
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = FALSE;
-#line 11445 "scanner.c"
+#line 11567 "scanner.c"
 	}
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp35_;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
-#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11453 "scanner.c"
+#line 11575 "scanner.c"
 	}
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = self->priv->n_used;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = n_read;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = _tmp40_ + ((gint) _tmp41_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = self->priv->n_used;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = self->priv->parameters;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_.bytes_per_line;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp42_ >= _tmp44_) {
-#line 11469 "scanner.c"
-		ScanLine* _tmp45_;
-		ScanLine* line;
-		SANE_Parameters _tmp46_;
-		SANE_Frame _tmp47_;
-		ScanLine* _tmp53_;
-		SANE_Parameters _tmp54_;
-		gint _tmp55_;
-		ScanLine* _tmp56_;
-		SANE_Parameters _tmp57_;
-		gint _tmp58_;
-		ScanLine* _tmp59_;
-		guchar* _tmp60_;
-		gint _tmp60__length1;
-		ScanLine* _tmp61_;
-		SANE_Parameters _tmp62_;
-		gint _tmp63_;
-		ScanLine* _tmp64_;
-		gint _tmp65_;
-		ScanLine* _tmp66_;
-		gint _tmp67_;
-		ScanLine* _tmp68_;
-		gint _tmp69_;
-		gint _tmp70_;
-		ScanLine* _tmp71_;
-		gint _tmp72_;
-		guchar* _tmp73_;
-		gint _tmp73__length1;
-		gint buffer_size;
-		gboolean _tmp74_;
-		gint _tmp78_;
+#line 11591 "scanner.c"
+		ScanLine* line = NULL;
+		ScanLine* _tmp45_ = NULL;
+		SANE_Parameters _tmp46_ = {0};
+		SANE_Frame _tmp47_ = 0;
+		ScanLine* _tmp53_ = NULL;
+		SANE_Parameters _tmp54_ = {0};
+		gint _tmp55_ = 0;
+		ScanLine* _tmp56_ = NULL;
+		SANE_Parameters _tmp57_ = {0};
+		gint _tmp58_ = 0;
+		ScanLine* _tmp59_ = NULL;
+		guchar* _tmp60_ = NULL;
+		gint _tmp60__length1 = 0;
+		ScanLine* _tmp61_ = NULL;
+		SANE_Parameters _tmp62_ = {0};
+		gint _tmp63_ = 0;
+		ScanLine* _tmp64_ = NULL;
+		gint _tmp65_ = 0;
+		ScanLine* _tmp66_ = NULL;
+		gint _tmp67_ = 0;
+		ScanLine* _tmp68_ = NULL;
+		gint _tmp69_ = 0;
+		gint _tmp70_ = 0;
+		ScanLine* _tmp71_ = NULL;
+		gint _tmp72_ = 0;
+		gint buffer_size = 0;
+		guchar* _tmp73_ = NULL;
+		gint _tmp73__length1 = 0;
+		gboolean _tmp74_ = FALSE;
+		gint _tmp78_ = 0;
 		guchar* _tmp79_ = NULL;
-		gint _tmp80_;
-		ScanLine* _tmp81_;
-		gint _tmp82_;
-		ScanLine* _tmp83_;
-		gint _tmp84_;
-		gint n_remaining;
+		gint n_remaining = 0;
+		gint _tmp80_ = 0;
+		ScanLine* _tmp81_ = NULL;
+		gint _tmp82_ = 0;
+		ScanLine* _tmp83_ = NULL;
+		gint _tmp84_ = 0;
 		gboolean _tmp102_ = FALSE;
 		gboolean _tmp103_ = FALSE;
 		gboolean _tmp104_ = FALSE;
-		SANE_Parameters _tmp105_;
-		gint _tmp106_;
-		gboolean _tmp109_;
-		gboolean _tmp112_;
-		gboolean _tmp115_;
-		ScanJob* _tmp160_;
-		gint _tmp161_;
-		ScanLine* _tmp162_;
-		NotifyGotLine* _tmp163_;
-		NotifyGotLine* _tmp164_;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Parameters _tmp105_ = {0};
+		gint _tmp106_ = 0;
+		gboolean _tmp109_ = FALSE;
+		gboolean _tmp112_ = FALSE;
+		gboolean _tmp115_ = FALSE;
+		ScanJob* _tmp160_ = NULL;
+		gint _tmp161_ = 0;
+		ScanLine* _tmp162_ = NULL;
+		NotifyGotLine* _tmp163_ = NULL;
+		NotifyGotLine* _tmp164_ = NULL;
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = scan_line_new ();
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		line = _tmp45_;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = self->priv->parameters;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp47_ = _tmp46_.format;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp47_) {
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11532 "scanner.c"
+#line 11654 "scanner.c"
 			{
-				ScanLine* _tmp48_;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp48_ = NULL;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = line;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_->channel = 0;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11541 "scanner.c"
+#line 11663 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11545 "scanner.c"
+#line 11667 "scanner.c"
 			{
-				ScanLine* _tmp49_;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp49_ = NULL;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = line;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_->channel = -1;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11554 "scanner.c"
+#line 11676 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11558 "scanner.c"
+#line 11680 "scanner.c"
 			{
-				ScanLine* _tmp50_;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp50_ = NULL;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = line;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_->channel = 0;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11567 "scanner.c"
+#line 11689 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11571 "scanner.c"
+#line 11693 "scanner.c"
 			{
-				ScanLine* _tmp51_;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp51_ = NULL;
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_ = line;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_->channel = 1;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11580 "scanner.c"
+#line 11702 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11584 "scanner.c"
+#line 11706 "scanner.c"
 			{
-				ScanLine* _tmp52_;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp52_ = NULL;
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_ = line;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_->channel = 2;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11593 "scanner.c"
+#line 11715 "scanner.c"
 			}
 			default:
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11598 "scanner.c"
+#line 11720 "scanner.c"
 		}
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = line;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = self->priv->parameters;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = _tmp54_.pixels_per_line;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_->width = _tmp55_;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = line;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = self->priv->parameters;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = _tmp57_.depth;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_->depth = _tmp58_;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = line;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = self->priv->buffer;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60__length1 = self->priv->buffer_length1;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data = (g_free (_tmp59_->data), NULL);
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data = _tmp60_;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data_length1 = _tmp60__length1;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = line;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = self->priv->parameters;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = _tmp62_.bytes_per_line;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_->data_length = _tmp63_;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_ = line;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = self->priv->line_count;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_->number = _tmp65_;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = line;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = self->priv->n_used;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = line;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = _tmp68_->data_length;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_->n_lines = _tmp67_ / _tmp69_;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = self->priv->line_count;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = line;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = _tmp71_->n_lines;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->line_count = _tmp70_ + _tmp72_;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = self->priv->buffer;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73__length1 = self->priv->buffer_length1;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		buffer_size = _tmp73__length1;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp74_ = full_read;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp74_) {
-#line 11672 "scanner.c"
-			gint _tmp75_;
-			SANE_Parameters _tmp76_;
-			gint _tmp77_;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11794 "scanner.c"
+			gint _tmp75_ = 0;
+			SANE_Parameters _tmp76_ = {0};
+			gint _tmp77_ = 0;
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp75_ = buffer_size;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp76_ = self->priv->parameters;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp77_ = _tmp76_.bytes_per_line;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp75_ + _tmp77_;
-#line 11684 "scanner.c"
+#line 11806 "scanner.c"
 		}
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp78_ = buffer_size;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp79_ = g_new0 (guchar, _tmp78_);
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = _tmp79_;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = _tmp78_;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp80_ = self->priv->n_used;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp81_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp82_ = _tmp81_->n_lines;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp83_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp84_ = _tmp83_->data_length;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		n_remaining = _tmp80_ - (_tmp82_ * _tmp84_);
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11712 "scanner.c"
+#line 11834 "scanner.c"
 		{
-			gint i;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gint i = 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11717 "scanner.c"
+#line 11839 "scanner.c"
 			{
-				gboolean _tmp85_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gboolean _tmp85_ = FALSE;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = TRUE;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11724 "scanner.c"
-					gboolean _tmp86_;
-					gint _tmp88_;
-					gint _tmp89_;
-					guchar* _tmp90_;
-					gint _tmp90__length1;
-					gint _tmp91_;
-					ScanLine* _tmp92_;
-					guchar* _tmp93_;
-					gint _tmp93__length1;
-					gint _tmp94_;
-					ScanLine* _tmp95_;
-					gint _tmp96_;
-					ScanLine* _tmp97_;
-					gint _tmp98_;
-					guchar _tmp99_;
-					guchar _tmp100_;
-					gint _tmp101_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11846 "scanner.c"
+					gboolean _tmp86_ = FALSE;
+					gint _tmp88_ = 0;
+					gint _tmp89_ = 0;
+					guchar* _tmp90_ = NULL;
+					gint _tmp90__length1 = 0;
+					gint _tmp91_ = 0;
+					ScanLine* _tmp92_ = NULL;
+					guchar* _tmp93_ = NULL;
+					gint _tmp93__length1 = 0;
+					gint _tmp94_ = 0;
+					ScanLine* _tmp95_ = NULL;
+					gint _tmp96_ = 0;
+					ScanLine* _tmp97_ = NULL;
+					gint _tmp98_ = 0;
+					guchar _tmp99_ = '\0';
+					guchar _tmp100_ = '\0';
+					gint _tmp101_ = 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = _tmp85_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp86_) {
-#line 11746 "scanner.c"
-						gint _tmp87_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11868 "scanner.c"
+						gint _tmp87_ = 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp87_ = i;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp87_ + 1;
-#line 11752 "scanner.c"
+#line 11874 "scanner.c"
 					}
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp85_ = FALSE;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = i;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = n_remaining;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!(_tmp88_ < _tmp89_)) {
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11764 "scanner.c"
+#line 11886 "scanner.c"
 					}
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = self->priv->buffer;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90__length1 = self->priv->buffer_length1;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91_ = i;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp92_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93_ = _tmp92_->data;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93__length1 = _tmp92_->data_length1;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp94_ = i;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp95_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp96_ = _tmp95_->n_lines;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp97_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = _tmp97_->data_length;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp99_ = _tmp93_[_tmp94_ + (_tmp96_ * _tmp98_)];
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_[_tmp91_] = _tmp99_;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp100_ = _tmp90_[_tmp91_];
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp101_ = self->priv->n_used;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp101_ + 1;
-#line 11798 "scanner.c"
+#line 11920 "scanner.c"
 				}
 			}
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp105_ = self->priv->parameters;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp106_ = _tmp105_.depth;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp106_ == 8) {
-#line 11808 "scanner.c"
-			SANE_Parameters _tmp107_;
-			SANE_Frame _tmp108_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11930 "scanner.c"
+			SANE_Parameters _tmp107_ = {0};
+			SANE_Frame _tmp108_ = 0;
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = self->priv->parameters;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = _tmp107_.format;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = _tmp108_ == SANE_FRAME_GRAY;
-#line 11817 "scanner.c"
+#line 11939 "scanner.c"
 		} else {
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = FALSE;
-#line 11821 "scanner.c"
+#line 11943 "scanner.c"
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp109_ = _tmp104_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp109_) {
-#line 11827 "scanner.c"
-			ScanJob* _tmp110_;
-			gint _tmp111_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11949 "scanner.c"
+			ScanJob* _tmp110_ = NULL;
+			gint _tmp111_ = 0;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = job;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = _tmp110_->depth;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = _tmp111_ == 2;
-#line 11836 "scanner.c"
+#line 11958 "scanner.c"
 		} else {
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = FALSE;
-#line 11840 "scanner.c"
+#line 11962 "scanner.c"
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp112_ = _tmp103_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp112_) {
-#line 11846 "scanner.c"
-			ScanJob* _tmp113_;
-			ScanMode _tmp114_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11968 "scanner.c"
+			ScanJob* _tmp113_ = NULL;
+			ScanMode _tmp114_ = 0;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = job;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = _tmp113_->scan_mode;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp114_ == SCAN_MODE_GRAY;
-#line 11855 "scanner.c"
+#line 11977 "scanner.c"
 		} else {
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
-#line 11859 "scanner.c"
+#line 11981 "scanner.c"
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp115_ = _tmp102_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp115_) {
-#line 11865 "scanner.c"
-			guchar block;
-			gint write_offset;
-			gint block_shift;
-			ScanLine* _tmp157_;
-			ScanLine* _tmp158_;
-			gint _tmp159_;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11987 "scanner.c"
+			guchar block = '\0';
+			gint write_offset = 0;
+			gint block_shift = 0;
+			ScanLine* _tmp157_ = NULL;
+			ScanLine* _tmp158_ = NULL;
+			gint _tmp159_ = 0;
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block = (guchar) 0;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			write_offset = 0;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 11878 "scanner.c"
+#line 12000 "scanner.c"
 			{
-				gint i;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gint i = 0;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 11883 "scanner.c"
+#line 12005 "scanner.c"
 				{
-					gboolean _tmp116_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp116_ = FALSE;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp116_ = TRUE;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 11890 "scanner.c"
-						gboolean _tmp117_;
-						gint _tmp119_;
-						ScanLine* _tmp120_;
-						gint _tmp121_;
-						gint _tmp122_;
-						ScanLine* _tmp123_;
-						gint _tmp124_;
-						gint offset;
-						gint _tmp150_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12012 "scanner.c"
+						gboolean _tmp117_ = FALSE;
+						gint _tmp119_ = 0;
+						ScanLine* _tmp120_ = NULL;
+						gint _tmp121_ = 0;
+						gint offset = 0;
+						gint _tmp122_ = 0;
+						ScanLine* _tmp123_ = NULL;
+						gint _tmp124_ = 0;
+						gint _tmp150_ = 0;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp117_ = _tmp116_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp117_) {
-#line 11904 "scanner.c"
-							gint _tmp118_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12026 "scanner.c"
+							gint _tmp118_ = 0;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = i;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp118_ + 1;
-#line 11910 "scanner.c"
+#line 12032 "scanner.c"
 						}
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = FALSE;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp119_ = i;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp120_ = line;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp121_ = _tmp120_->n_lines;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp119_ < _tmp121_)) {
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 11924 "scanner.c"
+#line 12046 "scanner.c"
 						}
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp122_ = i;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp123_ = line;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp124_ = _tmp123_->data_length;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp122_ * _tmp124_;
-#line 11934 "scanner.c"
+#line 12056 "scanner.c"
 						{
-							gint x;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							gint x = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 11939 "scanner.c"
+#line 12061 "scanner.c"
 							{
-								gboolean _tmp125_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+								gboolean _tmp125_ = FALSE;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp125_ = TRUE;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 11946 "scanner.c"
-									gboolean _tmp126_;
-									gint _tmp128_;
-									ScanLine* _tmp129_;
-									gint _tmp130_;
-									ScanLine* _tmp131_;
-									guchar* _tmp132_;
-									gint _tmp132__length1;
-									gint _tmp133_;
-									gint _tmp134_;
-									guchar _tmp135_;
-									guchar p;
+#line 12068 "scanner.c"
+									gboolean _tmp126_ = FALSE;
+									gint _tmp128_ = 0;
+									ScanLine* _tmp129_ = NULL;
+									gint _tmp130_ = 0;
+									guchar p = '\0';
+									ScanLine* _tmp131_ = NULL;
+									guchar* _tmp132_ = NULL;
+									gint _tmp132__length1 = 0;
+									gint _tmp133_ = 0;
+									gint _tmp134_ = 0;
+									guchar _tmp135_ = '\0';
 									guchar sample = '\0';
-									guchar _tmp136_;
-									guchar _tmp139_;
-									guchar _tmp140_;
-									gint _tmp141_;
-									gint _tmp142_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+									guchar _tmp136_ = '\0';
+									guchar _tmp139_ = '\0';
+									guchar _tmp140_ = '\0';
+									gint _tmp141_ = 0;
+									gint _tmp142_ = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp126_ = _tmp125_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp126_) {
-#line 11968 "scanner.c"
-										gint _tmp127_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12090 "scanner.c"
+										gint _tmp127_ = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp127_ = x;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp127_ + 1;
-#line 11974 "scanner.c"
+#line 12096 "scanner.c"
 									}
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125_ = FALSE;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp128_ = x;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp129_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp130_ = _tmp129_->width;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!(_tmp128_ < _tmp130_)) {
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 11988 "scanner.c"
+#line 12110 "scanner.c"
 									}
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp131_ = line;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132_ = _tmp131_->data;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132__length1 = _tmp131_->data_length1;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp133_ = offset;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp134_ = x;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp135_ = _tmp132_[_tmp133_ + _tmp134_];
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									p = _tmp135_;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp136_ = p;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (((gint) _tmp136_) >= 192) {
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12010 "scanner.c"
+#line 12132 "scanner.c"
 									} else {
-										guchar _tmp137_;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										guchar _tmp137_ = '\0';
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_ = p;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										if (((gint) _tmp137_) >= 128) {
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12019 "scanner.c"
+#line 12141 "scanner.c"
 										} else {
-											guchar _tmp138_;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+											guchar _tmp138_ = '\0';
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											_tmp138_ = p;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											if (((gint) _tmp138_) >= 64) {
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12028 "scanner.c"
+#line 12150 "scanner.c"
 											} else {
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12032 "scanner.c"
+#line 12154 "scanner.c"
 											}
 										}
 									}
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp139_ = block;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp140_ = sample;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp141_ = block_shift;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									block = _tmp139_ | (_tmp140_ << _tmp141_);
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp142_ = block_shift;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp142_ == 0) {
-#line 12048 "scanner.c"
-										ScanLine* _tmp143_;
-										guchar* _tmp144_;
-										gint _tmp144__length1;
-										gint _tmp145_;
-										guchar _tmp146_;
-										guchar _tmp147_;
-										gint _tmp148_;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12170 "scanner.c"
+										ScanLine* _tmp143_ = NULL;
+										guchar* _tmp144_ = NULL;
+										gint _tmp144__length1 = 0;
+										gint _tmp145_ = 0;
+										guchar _tmp146_ = '\0';
+										guchar _tmp147_ = '\0';
+										gint _tmp148_ = 0;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp143_ = line;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144_ = _tmp143_->data;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144__length1 = _tmp143_->data_length1;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp145_ = write_offset;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp146_ = block;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144_[_tmp145_] = _tmp146_;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp147_ = _tmp144_[_tmp145_];
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp148_ = write_offset;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										write_offset = _tmp148_ + 1;
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block = (guchar) 0;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12078 "scanner.c"
+#line 12200 "scanner.c"
 									} else {
-										gint _tmp149_;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										gint _tmp149_ = 0;
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp149_ = block_shift;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp149_ - 2;
-#line 12085 "scanner.c"
+#line 12207 "scanner.c"
 									}
 								}
 							}
 						}
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp150_ = block_shift;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp150_ != 6) {
-#line 12094 "scanner.c"
-							ScanLine* _tmp151_;
-							guchar* _tmp152_;
-							gint _tmp152__length1;
-							gint _tmp153_;
-							guchar _tmp154_;
-							guchar _tmp155_;
-							gint _tmp156_;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12216 "scanner.c"
+							ScanLine* _tmp151_ = NULL;
+							guchar* _tmp152_ = NULL;
+							gint _tmp152__length1 = 0;
+							gint _tmp153_ = 0;
+							guchar _tmp154_ = '\0';
+							guchar _tmp155_ = '\0';
+							gint _tmp156_ = 0;
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp151_ = line;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152_ = _tmp151_->data;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152__length1 = _tmp151_->data_length1;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp153_ = write_offset;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp154_ = block;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152_[_tmp153_] = _tmp154_;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp155_ = _tmp152_[_tmp153_];
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp156_ = write_offset;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							write_offset = _tmp156_ + 1;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block = (guchar) 0;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12124 "scanner.c"
+#line 12246 "scanner.c"
 						}
 					}
 				}
 			}
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = line;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = line;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp159_ = _tmp158_->width;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_->data_length = ((_tmp159_ * 2) + 7) / 8;
-#line 12137 "scanner.c"
+#line 12259 "scanner.c"
 		}
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp160_ = job;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = _tmp160_->id;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp162_ = line;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp163_ = notify_got_line_new (_tmp161_, _tmp162_);
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp164_ = _tmp163_;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp164_);
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp164_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12155 "scanner.c"
+#line 12277 "scanner.c"
 	}
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12159 "scanner.c"
+#line 12281 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12166 "scanner.c"
+#line 12288 "scanner.c"
 }
 
 
 static void* scanner_scan_thread (Scanner* self) {
 	void* result = NULL;
 	SANE_Int version_code = {0};
+	SANE_Status status = 0;
 	SANE_Int _tmp0_ = {0};
 	SANE_Status _tmp1_ = 0;
-	SANE_Status status;
-	SANE_Status _tmp2_;
+	SANE_Status _tmp2_ = 0;
 	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_;
-	SANE_Status _tmp5_;
-	SANE_Int _tmp8_;
+	gchar* _tmp4_ = NULL;
+	SANE_Status _tmp5_ = 0;
+	SANE_Int _tmp8_ = {0};
 	gint _tmp9_ = 0;
-	SANE_Int _tmp10_;
+	SANE_Int _tmp10_ = {0};
 	gint _tmp11_ = 0;
-	SANE_Int _tmp12_;
+	SANE_Int _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	version_code = _tmp0_;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1431: sane_init () -> %s", _tmp4_);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1443: sane_init () -> %s", _tmp4_);
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12210 "scanner.c"
-		SANE_Status _tmp6_;
+#line 12332 "scanner.c"
+		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1434: Unable to initialize SANE backend: %s", _tmp7_);
-#line 1435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1446: Unable to initialize SANE backend: %s", _tmp7_);
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12223 "scanner.c"
+#line 12345 "scanner.c"
 	}
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = version_code;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = version_code;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1437: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1449: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_redetect (self);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12243 "scanner.c"
+#line 12365 "scanner.c"
 		gboolean _tmp14_ = FALSE;
-		ScanState _tmp15_;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		ScanState _tmp15_ = 0;
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = scanner_handle_requests (self);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp14_) {
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12252 "scanner.c"
+#line 12374 "scanner.c"
 		}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp15_) {
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12260 "scanner.c"
+#line 12382 "scanner.c"
 			{
-				GList* _tmp16_;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				GList* _tmp16_ = NULL;
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = self->priv->job_queue;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp16_ != NULL) {
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_scanning (self, TRUE);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12271 "scanner.c"
+#line 12393 "scanner.c"
 				}
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12275 "scanner.c"
+#line 12397 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12279 "scanner.c"
+#line 12401 "scanner.c"
 			{
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12285 "scanner.c"
+#line 12407 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12289 "scanner.c"
+#line 12411 "scanner.c"
 			{
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12295 "scanner.c"
+#line 12417 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12299 "scanner.c"
+#line 12421 "scanner.c"
 			{
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12305 "scanner.c"
+#line 12427 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12309 "scanner.c"
+#line 12431 "scanner.c"
 			{
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12315 "scanner.c"
+#line 12437 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12319 "scanner.c"
+#line 12441 "scanner.c"
 			{
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12325 "scanner.c"
+#line 12447 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12329 "scanner.c"
+#line 12451 "scanner.c"
 			{
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12335 "scanner.c"
+#line 12457 "scanner.c"
 			}
 			default:
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12340 "scanner.c"
+#line 12462 "scanner.c"
 		}
 	}
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12347 "scanner.c"
+#line 12469 "scanner.c"
 }
 
 
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
 	result = scanner_scan_thread (self);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12358 "scanner.c"
+#line 12480 "scanner.c"
 }
 
 
 void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12366 "scanner.c"
+#line 12488 "scanner.c"
 	{
-		GThread* _tmp0_;
-		GThread* _tmp1_;
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp1_ = _tmp0_;
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		GThread* _tmp0_ = NULL;
+		GThread* _tmp1_ = NULL;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp0_ = _tmp1_;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_inner_error_ != NULL) {
-#line 12376 "scanner.c"
+#line 12498 "scanner.c"
 			goto __catch15_g_error;
 		}
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->thread = _tmp1_;
-#line 12383 "scanner.c"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->thread = _tmp0_;
+#line 12505 "scanner.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_;
-		const gchar* _tmp3_;
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = e;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp2_->message;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_critical ("scanner.vala:1488: Unable to create thread: %s", _tmp3_);
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_critical ("scanner.vala:1500: Unable to create thread: %s", _tmp3_);
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12403 "scanner.c"
+#line 12525 "scanner.c"
 	}
 	__finally15:
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_inner_error_ != NULL) {
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12414 "scanner.c"
+#line 12536 "scanner.c"
 	}
 }
 
 
 void scanner_redetect (Scanner* self) {
-	gboolean _tmp0_;
-	GAsyncQueue* _tmp1_;
-	RequestRedetect* _tmp2_;
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gboolean _tmp0_ = FALSE;
+	GAsyncQueue* _tmp1_ = NULL;
+	RequestRedetect* _tmp2_ = NULL;
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->need_redetect;
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12431 "scanner.c"
+#line 12553 "scanner.c"
 	}
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1498: Requesting redetection of scan devices");
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1510: Requesting redetection of scan devices");
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_redetect_new ();
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12443 "scanner.c"
+#line 12565 "scanner.c"
 }
 
 
 gboolean scanner_is_scanning (Scanner* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gboolean _tmp0_ = FALSE;
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->scanning;
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp0_;
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12458 "scanner.c"
+#line 12580 "scanner.c"
 }
 
 
 static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	gchar* result = NULL;
-	ScanMode _tmp0_;
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanMode _tmp0_ = 0;
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = mode;
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12473 "scanner.c"
+#line 12595 "scanner.c"
 		{
-			gchar* _tmp1_;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp1_ = NULL;
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12482 "scanner.c"
+#line 12604 "scanner.c"
 		}
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12486 "scanner.c"
+#line 12608 "scanner.c"
 		{
-			gchar* _tmp2_;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp2_ = NULL;
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanMode.COLOR");
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12495 "scanner.c"
+#line 12617 "scanner.c"
 		}
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12499 "scanner.c"
+#line 12621 "scanner.c"
 		{
-			gchar* _tmp3_;
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp3_ = NULL;
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanMode.GRAY");
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12508 "scanner.c"
+#line 12630 "scanner.c"
 		}
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12512 "scanner.c"
+#line 12634 "scanner.c"
 		{
-			gchar* _tmp4_;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp4_ = NULL;
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanMode.LINEART");
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12521 "scanner.c"
+#line 12643 "scanner.c"
 		}
 		default:
 		{
-			ScanMode _tmp5_;
+			ScanMode _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = mode;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12535 "scanner.c"
+#line 12657 "scanner.c"
 		}
 	}
 }
@@ -12547,78 +12670,78 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 
 static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	gchar* result = NULL;
-	ScanType _tmp0_;
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanType _tmp0_ = 0;
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = type;
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12552 "scanner.c"
+#line 12674 "scanner.c"
 		{
-			gchar* _tmp1_;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp1_ = NULL;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanType.SINGLE");
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12561 "scanner.c"
+#line 12683 "scanner.c"
 		}
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12565 "scanner.c"
+#line 12687 "scanner.c"
 		{
-			gchar* _tmp2_;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp2_ = NULL;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12574 "scanner.c"
+#line 12696 "scanner.c"
 		}
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12578 "scanner.c"
+#line 12700 "scanner.c"
 		{
-			gchar* _tmp3_;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp3_ = NULL;
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12587 "scanner.c"
+#line 12709 "scanner.c"
 		}
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12591 "scanner.c"
+#line 12713 "scanner.c"
 		{
-			gchar* _tmp4_;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp4_ = NULL;
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12600 "scanner.c"
+#line 12722 "scanner.c"
 		}
 		default:
 		{
-			ScanType _tmp5_;
+			ScanType _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = type;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12614 "scanner.c"
+#line 12736 "scanner.c"
 		}
 	}
 }
@@ -12626,291 +12749,291 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 
 void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_;
-	const gchar* _tmp3_;
-	ScanOptions* _tmp4_;
-	gint _tmp5_;
-	ScanOptions* _tmp6_;
-	ScanMode _tmp7_;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	ScanOptions* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	ScanOptions* _tmp6_ = NULL;
+	ScanMode _tmp7_ = 0;
 	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_;
-	ScanOptions* _tmp10_;
-	gint _tmp11_;
-	ScanOptions* _tmp12_;
-	ScanType _tmp13_;
+	gchar* _tmp9_ = NULL;
+	ScanOptions* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
+	ScanOptions* _tmp12_ = NULL;
+	ScanType _tmp13_ = 0;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_;
-	ScanOptions* _tmp16_;
-	gint _tmp17_;
-	ScanOptions* _tmp18_;
-	gint _tmp19_;
-	ScanOptions* _tmp20_;
-	gint _tmp21_;
-	ScanOptions* _tmp22_;
-	gint _tmp23_;
-	RequestStartScan* _tmp24_;
-	RequestStartScan* request;
-	ScanJob* _tmp25_;
-	ScanJob* _tmp26_;
-	gint _tmp27_;
-	ScanJob* _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	ScanJob* _tmp31_;
-	ScanOptions* _tmp32_;
-	gint _tmp33_;
-	ScanJob* _tmp34_;
-	ScanOptions* _tmp35_;
-	ScanMode _tmp36_;
-	ScanJob* _tmp37_;
-	ScanOptions* _tmp38_;
-	gint _tmp39_;
-	ScanJob* _tmp40_;
-	ScanOptions* _tmp41_;
-	ScanType _tmp42_;
-	ScanJob* _tmp43_;
-	ScanOptions* _tmp44_;
-	gint _tmp45_;
-	ScanJob* _tmp46_;
-	ScanOptions* _tmp47_;
-	gint _tmp48_;
-	ScanJob* _tmp49_;
-	ScanOptions* _tmp50_;
-	gint _tmp51_;
-	ScanJob* _tmp52_;
-	ScanOptions* _tmp53_;
-	gint _tmp54_;
-	GAsyncQueue* _tmp55_;
-	Request* _tmp56_;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp15_ = NULL;
+	ScanOptions* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	ScanOptions* _tmp18_ = NULL;
+	gint _tmp19_ = 0;
+	ScanOptions* _tmp20_ = NULL;
+	gint _tmp21_ = 0;
+	ScanOptions* _tmp22_ = NULL;
+	gint _tmp23_ = 0;
+	RequestStartScan* request = NULL;
+	RequestStartScan* _tmp24_ = NULL;
+	ScanJob* _tmp25_ = NULL;
+	ScanJob* _tmp26_ = NULL;
+	gint _tmp27_ = 0;
+	ScanJob* _tmp28_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	gchar* _tmp30_ = NULL;
+	ScanJob* _tmp31_ = NULL;
+	ScanOptions* _tmp32_ = NULL;
+	gint _tmp33_ = 0;
+	ScanJob* _tmp34_ = NULL;
+	ScanOptions* _tmp35_ = NULL;
+	ScanMode _tmp36_ = 0;
+	ScanJob* _tmp37_ = NULL;
+	ScanOptions* _tmp38_ = NULL;
+	gint _tmp39_ = 0;
+	ScanJob* _tmp40_ = NULL;
+	ScanOptions* _tmp41_ = NULL;
+	ScanType _tmp42_ = 0;
+	ScanJob* _tmp43_ = NULL;
+	ScanOptions* _tmp44_ = NULL;
+	gint _tmp45_ = 0;
+	ScanJob* _tmp46_ = NULL;
+	ScanOptions* _tmp47_ = NULL;
+	gint _tmp48_ = 0;
+	ScanJob* _tmp49_ = NULL;
+	ScanOptions* _tmp50_ = NULL;
+	gint _tmp51_ = 0;
+	ScanJob* _tmp52_ = NULL;
+	ScanOptions* _tmp53_ = NULL;
+	gint _tmp54_ = 0;
+	GAsyncQueue* _tmp55_ = NULL;
+	Request* _tmp56_ = NULL;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (options != NULL);
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = device;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12686 "scanner.c"
-		const gchar* _tmp2_;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12808 "scanner.c"
+		const gchar* _tmp2_ = NULL;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12692 "scanner.c"
+#line 12814 "scanner.c"
 	} else {
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12696 "scanner.c"
+#line 12818 "scanner.c"
 	}
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp0_;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->dpi;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp6_->scan_mode;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = scanner_get_scan_mode_string (self, _tmp7_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = _tmp8_;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->depth;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _tmp12_->type;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = scanner_get_scan_type_string (self, _tmp13_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = _tmp16_->paper_width;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->paper_height;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = _tmp20_->brightness;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_->contrast;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1544: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1556: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
 "d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
 "d)", _tmp3_, _tmp5_, _tmp9_, _tmp11_, _tmp15_, _tmp17_, _tmp19_, _tmp21_, _tmp23_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp9_);
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = request_start_scan_new ();
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request = _tmp24_;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = scan_job_new ();
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request->job = _tmp25_;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = request->job;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = self->job_id;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->job_id = _tmp27_ + 1;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_->id = _tmp27_;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = request->job;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = device;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = g_strdup (_tmp29_);
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp28_->device);
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_->device = _tmp30_;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = request->job;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = options;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_->dpi;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_->dpi = (gdouble) _tmp33_;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = request->job;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = options;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_->scan_mode;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_->scan_mode = _tmp36_;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = request->job;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = options;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp38_->depth;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_->depth = _tmp39_;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = request->job;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = options;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_->type;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_->type = _tmp42_;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = request->job;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = options;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->paper_width;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_->page_width = _tmp45_;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = request->job;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = options;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = _tmp47_->paper_height;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_->page_height = _tmp48_;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = request->job;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = options;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = _tmp50_->brightness;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_->brightness = _tmp51_;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = request->job;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = _tmp53_->contrast;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_->contrast = _tmp54_;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = self->priv->request_queue;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = _request_ref0 ((Request*) request);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp55_, _tmp56_);
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12846 "scanner.c"
+#line 12968 "scanner.c"
 }
 
 
 void scanner_cancel (Scanner* self) {
-	gint _tmp0_;
-	GAsyncQueue* _tmp1_;
-	RequestCancel* _tmp2_;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gint _tmp0_ = 0;
+	GAsyncQueue* _tmp1_ = NULL;
+	RequestCancel* _tmp2_ = NULL;
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->job_id;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->first_job_id = _tmp0_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_cancel_new ();
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12866 "scanner.c"
+#line 12988 "scanner.c"
 }
 
 
 void scanner_free (Scanner* self) {
-	GAsyncQueue* _tmp0_;
-	RequestQuit* _tmp1_;
-	GThread* _tmp2_;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	GAsyncQueue* _tmp0_ = NULL;
+	RequestQuit* _tmp1_ = NULL;
+	GThread* _tmp2_ = NULL;
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1571: Stopping scan thread");
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1583: Stopping scan thread");
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->request_queue;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = request_quit_new ();
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->thread;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 12888 "scanner.c"
-		GThread* _tmp3_;
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 13010 "scanner.c"
+		GThread* _tmp3_ = NULL;
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_thread_join (_tmp3_);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 12898 "scanner.c"
+#line 13020 "scanner.c"
 	}
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1582: sane_exit ()");
-#line 12904 "scanner.c"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1594: sane_exit ()");
+#line 13026 "scanner.c"
 }
 
 
@@ -12929,19 +13052,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12923 "scanner.c"
+#line 13045 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12929 "scanner.c"
+#line 13051 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
-#line 12935 "scanner.c"
+#line 13057 "scanner.c"
 }
 
 
@@ -12960,19 +13083,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12954 "scanner.c"
+#line 13076 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12960 "scanner.c"
+#line 13082 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
-#line 12966 "scanner.c"
+#line 13088 "scanner.c"
 }
 
 
@@ -12991,26 +13114,26 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12985 "scanner.c"
+#line 13107 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12991 "scanner.c"
+#line 13113 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 12997 "scanner.c"
+#line 13119 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 13004 "scanner.c"
+#line 13126 "scanner.c"
 }
 
 
@@ -13019,7 +13142,7 @@ static void value_scanner_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
-#line 13013 "scanner.c"
+#line 13135 "scanner.c"
 	}
 }
 
@@ -13029,11 +13152,11 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
-#line 13023 "scanner.c"
+#line 13145 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13027 "scanner.c"
+#line 13149 "scanner.c"
 	}
 }
 
@@ -13041,37 +13164,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_scanner_peek_pointer (const GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13035 "scanner.c"
+#line 13157 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 13042 "scanner.c"
+#line 13164 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13049 "scanner.c"
+#line 13171 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13053 "scanner.c"
+#line 13175 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13057 "scanner.c"
+#line 13179 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13061 "scanner.c"
+#line 13183 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13065 "scanner.c"
+#line 13187 "scanner.c"
 }
 
 
@@ -13082,25 +13205,25 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13076 "scanner.c"
+#line 13198 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 13082 "scanner.c"
+#line 13204 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13086 "scanner.c"
+#line 13208 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13090 "scanner.c"
+#line 13212 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13094 "scanner.c"
+#line 13216 "scanner.c"
 }
 
 
@@ -13114,7 +13237,7 @@ GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 13108 "scanner.c"
+#line 13230 "scanner.c"
 }
 
 
@@ -13123,7 +13246,7 @@ gpointer value_get_scanner (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13117 "scanner.c"
+#line 13239 "scanner.c"
 }
 
 
@@ -13143,17 +13266,17 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
-#line 13137 "scanner.c"
+#line 13259 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13141 "scanner.c"
+#line 13263 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13147 "scanner.c"
+#line 13269 "scanner.c"
 	}
 }
 
@@ -13172,17 +13295,17 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 13166 "scanner.c"
+#line 13288 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13170 "scanner.c"
+#line 13292 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13176 "scanner.c"
+#line 13298 "scanner.c"
 	}
 }
 
@@ -13212,7 +13335,7 @@ static void scanner_class_init (ScannerClass * klass) {
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13206 "scanner.c"
+#line 13328 "scanner.c"
 }
 
 
@@ -13221,7 +13344,7 @@ static void scanner_instance_init (Scanner * self) {
 	self->priv = SCANNER_GET_PRIVATE (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 13215 "scanner.c"
+#line 13337 "scanner.c"
 }
 
 
@@ -13247,7 +13370,7 @@ static void scanner_finalize (Scanner* obj) {
 	_g_hash_table_unref0 (self->priv->options);
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 13241 "scanner.c"
+#line 13363 "scanner.c"
 }
 
 
@@ -13272,7 +13395,7 @@ gpointer scanner_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 13266 "scanner.c"
+#line 13388 "scanner.c"
 }
 
 
@@ -13285,7 +13408,7 @@ void scanner_unref (gpointer instance) {
 		SCANNER_GET_CLASS (self)->finalize (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13279 "scanner.c"
+#line 13401 "scanner.c"
 	}
 }
 
diff --git a/src/scanner.vala b/src/scanner.vala
index 4233337..33cf86f 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -504,6 +504,32 @@ public class Scanner
         result = Sane.UNFIX (v_fixed);
     }
 
+    private void set_fixed_or_int_option (Sane.Handle handle, Sane.OptionDescriptor option, Sane.Int option_index, double value, out double result)
+    {
+        if (option.type == Sane.ValueType.FIXED)
+            set_fixed_option (handle, option, option_index, value, out result);
+        else if (option.type == Sane.ValueType.INT)
+        {
+            int r;
+            set_int_option (handle, option, option_index, (int) Math.round (value), out r);
+            result = r;
+        }
+        else
+        {
+            result = 0.0;
+            warning ("Unable to set unsupported option type");
+        }
+    }
+
+    private void set_option_to_max (Sane.Handle handle, Sane.OptionDescriptor option, Sane.Int option_index)
+    {
+        if (option.constraint_type != Sane.ConstraintType.RANGE)
+            return;
+
+        var status = Sane.control_option (handle, option_index, Sane.Action.SET_VALUE, &option.range.max, null);
+        debug ("sane_control_option (%d, SANE_ACTION_SET_VALUE, option.range.max) -> (%s)", (int) option_index, Sane.status_to_string (status));
+    }
+
     private bool set_string_option (Sane.Handle handle, Sane.OptionDescriptor option, Sane.Int option_index, string value, out string result)
     {
         result = "";
@@ -1033,14 +1059,7 @@ public class Scanner
             option = get_option_by_name (handle, Sane.NAME_SCAN_RESOLUTION, out index);
             if (option != null)
             {
-                if (option.type == Sane.ValueType.FIXED)
-                    set_fixed_option (handle, option, index, job.dpi, out job.dpi);
-                else
-                {
-                    int dpi;
-                    set_int_option (handle, option, index, (int) job.dpi, out dpi);
-                    job.dpi = dpi;
-                }
+                set_fixed_or_int_option (handle, option, index, job.dpi, out job.dpi);
                 option = get_option_by_name (handle, Sane.NAME_BIT_DEPTH, out index);
                 if (option != null)
                 {
@@ -1049,52 +1068,32 @@ public class Scanner
                 }
             }
 
-            /* Always use maximum scan area - some scanners default to using partial areas.  This should be patched in sane-backends */
+            /* Set scan area */
             option = get_option_by_name (handle, Sane.NAME_SCAN_BR_X, out index);
             if (option != null)
             {
-                if (option.constraint_type == Sane.ConstraintType.RANGE)
-                {
-                    if (option.type == Sane.ValueType.FIXED)
-                        set_fixed_option (handle, option, index, Sane.UNFIX (option.range.max), null);
-                    else
-                        set_int_option (handle, option, index, (int) option.range.max, null);
-                }
+                if (job.page_width > 0)
+                    set_fixed_or_int_option (handle, option, index, convert_page_size (option, job.page_width, job.dpi), null);
+                else
+                    set_option_to_max (handle, option, index);
             }
             option = get_option_by_name (handle, Sane.NAME_SCAN_BR_Y, out index);
             if (option != null)
             {
-                if (option.constraint_type == Sane.ConstraintType.RANGE)
-                {
-                    if (option.type == Sane.ValueType.FIXED)
-                        set_fixed_option (handle, option, index, Sane.UNFIX (option.range.max), null);
-                    else
-                        set_int_option (handle, option, index, (int) option.range.max, null);
-                }
+                if (job.page_height > 0)
+                    set_fixed_or_int_option (handle, option, index, convert_page_size (option, job.page_height, job.dpi), null);
+                else
+                    set_option_to_max (handle, option, index);
             }
 
+            /* Set page size */
             option = get_option_by_name (handle, Sane.NAME_PAGE_WIDTH, out index);
-            if (option != null)
-            {
-                if (job.page_width > 0.0)
-                {
-                    if (option.type == Sane.ValueType.FIXED)
-                        set_fixed_option (handle, option, index, job.page_width / 10.0, null);
-                    else
-                        set_int_option (handle, option, index, job.page_width / 10, null);
-                }
-            }
+            if (option != null && job.page_width > 0.0)
+                set_fixed_or_int_option (handle, option, index, convert_page_size (option, job.page_width, job.dpi), null);
             option = get_option_by_name (handle, Sane.NAME_PAGE_HEIGHT, out index);
-            if (option != null)
-            {
-                if (job.page_height > 0.0)
-                {
-                    if (option.type == Sane.ValueType.FIXED)
-                        set_fixed_option (handle, option, index, job.page_height / 10.0, null);
-                    else
-                        set_int_option (handle, option, index, job.page_height / 10, null);
-                }
-            }
+            if (option != null && job.page_height > 0.0)
+                set_fixed_or_int_option (handle, option, index, convert_page_size (option, job.page_height, job.dpi), null);
+
             option = get_option_by_name (handle, Sane.NAME_BRIGHTNESS, out index);
             if (option != null)
             {
@@ -1155,6 +1154,19 @@ public class Scanner
         options.insert (option.name, (int) index);
     }
 
+    private double convert_page_size (Sane.OptionDescriptor option, double size, double dpi)
+    {
+        if (option.unit == Sane.Unit.PIXEL)
+            return dpi * size / 254.0;
+        else if (option.unit == Sane.Unit.MM)
+            return size / 10.0;
+        else
+        {
+            warning ("Unable to set unsupported unit type");
+            return 0.0f;
+        }
+    }
+
     private Sane.OptionDescriptor? get_option_by_name (Sane.Handle handle, string name, out int index)
     {
         index = options.lookup (name);
diff --git a/src/simple-scan.c b/src/simple-scan.c
index b75f90d..754893a 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.20.1, the Vala compiler
+/* simple-scan.c generated by valac 0.22.1, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -140,7 +140,7 @@ typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
 
 #define TYPE_SCAN_TYPE (scan_type_get_type ())
 #define _fclose0(var) ((var == NULL) ? NULL : (var = (fclose (var), NULL)))
-#define _g_match_info_free0(var) ((var == NULL) ? NULL : (var = (g_match_info_free (var), NULL)))
+#define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL)))
 #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 #define _g_option_context_free0(var) ((var == NULL) ? NULL : (var = (g_option_context_free (var), NULL)))
@@ -335,7 +335,7 @@ static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (S
 static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device);
 static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self);
 void user_interface_set_scan_devices (UserInterface* self, GList* devices);
-void user_interface_set_selected_device (UserInterface* self, const gchar* device);
+void user_interface_set_selected_device (UserInterface* self, const gchar* value);
 static void _scan_device_unref0_ (gpointer var);
 static void _g_list_free__scan_device_unref0_ (GList* self);
 static void simple_scan_real_activate (GApplication* base);
@@ -354,35 +354,40 @@ gpointer value_get_page (const GValue* value);
 GType page_get_type (void) G_GNUC_CONST;
 static Page* simple_scan_append_page (SimpleScan* self);
 Page* book_get_page (Book* self, gint page_number);
-gboolean page_has_data (Page* self);
-void user_interface_set_selected_page (UserInterface* self, Page* page);
+gboolean page_get_has_data (Page* self);
+void user_interface_set_selected_page (UserInterface* self, Page* value);
 void page_start (Page* self);
 GType scan_direction_get_type (void) G_GNUC_CONST;
 ScanDirection page_get_scan_direction (Page* self);
 gint page_get_width (Page* self);
 gint page_get_height (Page* self);
 gint page_get_dpi (Page* self);
-gboolean page_has_crop (Page* self);
-gchar* page_get_named_crop (Page* self);
-void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height);
-Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction);
+gboolean page_get_has_crop (Page* self);
+const gchar* page_get_crop_name (Page* self);
+gint page_get_crop_x (Page* self);
+gint page_get_crop_y (Page* self);
+gint page_get_crop_width (Page* self);
+gint page_get_crop_height (Page* self);
+Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
+Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
+void book_append_page (Book* self, Page* page);
 void page_set_named_crop (Page* self, const gchar* name);
 void page_set_custom_crop (Page* self, gint width, gint height);
 void page_move_crop (Page* self, gint x, gint y);
 static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar* device_name);
 void page_set_page_info (Page* self, ScanPageInfo* info);
-void page_set_color_profile (Page* self, const gchar* color_profile);
+void page_set_color_profile (Page* self, const gchar* value);
 guint book_get_n_pages (Book* self);
 void page_parse_scan_line (Page* self, ScanLine* line);
 void page_finish (Page* self);
 static void simple_scan_remove_empty_page (SimpleScan* self);
 void book_delete_page (Book* self, Page* page);
 void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint);
-void user_interface_set_scanning (UserInterface* self, gboolean scanning);
 gboolean scanner_is_scanning (Scanner* self);
+void user_interface_set_scanning (UserInterface* self, gboolean value);
 GType scan_mode_get_type (void) G_GNUC_CONST;
 GType scan_type_get_type (void) G_GNUC_CONST;
-void user_interface_set_default_file_name (UserInterface* self, const gchar* default_file_name);
+void user_interface_set_default_file_name (UserInterface* self, const gchar* value);
 void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options);
 void scanner_cancel (Scanner* self);
 static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar* prefix, const gchar* extension);
@@ -406,14 +411,14 @@ const GOptionEntry SIMPLE_SCAN_options[4] = {{"version", 'v', 0, G_OPTION_ARG_NO
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 410 "simple-scan.c"
+#line 415 "simple-scan.c"
 }
 
 
 SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
 	SimpleScan * self = NULL;
-	ScanDevice* _tmp0_;
-	ScanDevice* _tmp1_;
+	ScanDevice* _tmp0_ = NULL;
+	ScanDevice* _tmp1_ = NULL;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) g_object_new (object_type, NULL);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -426,112 +431,119 @@ SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
 	self->priv->default_device = _tmp1_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self;
-#line 430 "simple-scan.c"
+#line 435 "simple-scan.c"
 }
 
 
 SimpleScan* simple_scan_new (ScanDevice* device) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_construct (TYPE_SIMPLE_SCAN, device);
-#line 437 "simple-scan.c"
+#line 442 "simple-scan.c"
+}
+
+
+static gpointer _book_ref0 (gpointer self) {
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	return self ? book_ref (self) : NULL;
+#line 449 "simple-scan.c"
 }
 
 
 static void _simple_scan_scan_cb_user_interface_start_scan (UserInterface* _sender, const gchar* device, ScanOptions* options, gpointer self) {
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scan_cb (self, _sender, device, options);
-#line 444 "simple-scan.c"
+#line 456 "simple-scan.c"
 }
 
 
 static void _simple_scan_cancel_cb_user_interface_stop_scan (UserInterface* _sender, gpointer self) {
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_cancel_cb (self, _sender);
-#line 451 "simple-scan.c"
+#line 463 "simple-scan.c"
 }
 
 
 static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gint quality, gpointer self) {
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_email_cb (self, _sender, profile, quality);
-#line 458 "simple-scan.c"
+#line 470 "simple-scan.c"
 }
 
 
 static void _simple_scan_update_scan_devices_cb_scanner_update_devices (Scanner* _sender, GList* devices, gpointer self) {
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_update_scan_devices_cb (self, _sender, devices);
-#line 465 "simple-scan.c"
+#line 477 "simple-scan.c"
 }
 
 
 static void _simple_scan_authorize_cb_scanner_request_authorization (Scanner* _sender, const gchar* resource, gpointer self) {
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_authorize_cb (self, _sender, resource);
-#line 472 "simple-scan.c"
+#line 484 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_new_page_cb_scanner_expect_page (Scanner* _sender, gpointer self) {
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_new_page_cb (self, _sender);
-#line 479 "simple-scan.c"
+#line 491 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_info_cb_scanner_got_page_info (Scanner* _sender, ScanPageInfo* info, gpointer self) {
 #line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_info_cb (self, _sender, info);
-#line 486 "simple-scan.c"
+#line 498 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_line_cb_scanner_got_line (Scanner* _sender, ScanLine* line, gpointer self) {
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_line_cb (self, _sender, line);
-#line 493 "simple-scan.c"
+#line 505 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_done_cb_scanner_page_done (Scanner* _sender, gpointer self) {
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_done_cb (self, _sender);
-#line 500 "simple-scan.c"
+#line 512 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_document_done_cb_scanner_document_done (Scanner* _sender, gpointer self) {
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_document_done_cb (self, _sender);
-#line 507 "simple-scan.c"
+#line 519 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self) {
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_failed_cb (self, _sender, error_code, error_string);
-#line 514 "simple-scan.c"
+#line 526 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self) {
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_scanning_changed_cb (self, _sender);
-#line 521 "simple-scan.c"
+#line 533 "simple-scan.c"
 }
 
 
 static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_on_uevent (self, _sender, action, device);
-#line 528 "simple-scan.c"
+#line 540 "simple-scan.c"
 }
 
 
 static void _scan_device_unref0_ (gpointer var) {
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 535 "simple-scan.c"
+#line 547 "simple-scan.c"
 }
 
 
@@ -540,38 +552,40 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_free (self);
-#line 544 "simple-scan.c"
+#line 556 "simple-scan.c"
 }
 
 
 static void simple_scan_real_startup (GApplication* base) {
 	SimpleScan * self;
-	UserInterface* _tmp0_;
-	UserInterface* _tmp1_;
+	UserInterface* _tmp0_ = NULL;
+	UserInterface* _tmp1_ = NULL;
 	Book* _tmp2_ = NULL;
-	UserInterface* _tmp3_;
-	UserInterface* _tmp4_;
-	UserInterface* _tmp5_;
-	Scanner* _tmp6_ = NULL;
-	Scanner* _tmp7_;
-	Scanner* _tmp8_;
-	Scanner* _tmp9_;
-	Scanner* _tmp10_;
-	Scanner* _tmp11_;
-	Scanner* _tmp12_;
-	Scanner* _tmp13_;
-	Scanner* _tmp14_;
-	Scanner* _tmp15_;
-	gchar* _tmp16_;
-	gchar** _tmp17_ = NULL;
-	gchar** subsystems;
-	gint subsystems_length1;
-	gint _subsystems_size_;
-	gchar** _tmp18_;
-	gint _tmp18__length1;
-	GUdevClient* _tmp19_;
-	GUdevClient* _tmp20_;
-	ScanDevice* _tmp21_;
+	Book* _tmp3_ = NULL;
+	Book* _tmp4_ = NULL;
+	UserInterface* _tmp5_ = NULL;
+	UserInterface* _tmp6_ = NULL;
+	UserInterface* _tmp7_ = NULL;
+	Scanner* _tmp8_ = NULL;
+	Scanner* _tmp9_ = NULL;
+	Scanner* _tmp10_ = NULL;
+	Scanner* _tmp11_ = NULL;
+	Scanner* _tmp12_ = NULL;
+	Scanner* _tmp13_ = NULL;
+	Scanner* _tmp14_ = NULL;
+	Scanner* _tmp15_ = NULL;
+	Scanner* _tmp16_ = NULL;
+	Scanner* _tmp17_ = NULL;
+	gchar** subsystems = NULL;
+	gchar* _tmp18_ = NULL;
+	gchar** _tmp19_ = NULL;
+	gint subsystems_length1 = 0;
+	gint _subsystems_size_ = 0;
+	gchar** _tmp20_ = NULL;
+	gint _tmp20__length1 = 0;
+	GUdevClient* _tmp21_ = NULL;
+	GUdevClient* _tmp22_ = NULL;
+	ScanDevice* _tmp23_ = NULL;
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
 #line 46 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -587,140 +601,144 @@ static void simple_scan_real_startup (GApplication* base) {
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = user_interface_get_book (_tmp1_);
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp3_ = _tmp2_;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp4_ = _book_ref0 (_tmp3_);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->book = _tmp2_;
+	self->priv->book = _tmp4_;
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = self->priv->ui;
+	_tmp5_ = self->priv->ui;
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp3_, "start-scan", (GCallback) _simple_scan_scan_cb_user_interface_start_scan, self, 0);
+	g_signal_connect_object (_tmp5_, "start-scan", (GCallback) _simple_scan_scan_cb_user_interface_start_scan, self, 0);
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = self->priv->ui;
+	_tmp6_ = self->priv->ui;
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp4_, "stop-scan", (GCallback) _simple_scan_cancel_cb_user_interface_stop_scan, self, 0);
+	g_signal_connect_object (_tmp6_, "stop-scan", (GCallback) _simple_scan_cancel_cb_user_interface_stop_scan, self, 0);
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = self->priv->ui;
+	_tmp7_ = self->priv->ui;
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp5_, "email", (GCallback) _simple_scan_email_cb_user_interface_email, self, 0);
+	g_signal_connect_object (_tmp7_, "email", (GCallback) _simple_scan_email_cb_user_interface_email, self, 0);
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp6_ = scanner_get_instance ();
+	_tmp8_ = scanner_get_instance ();
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scanner_unref0 (self->priv->scanner);
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->scanner = _tmp6_;
+	self->priv->scanner = _tmp8_;
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = self->priv->scanner;
+	_tmp9_ = self->priv->scanner;
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp7_, "update-devices", (GCallback) _simple_scan_update_scan_devices_cb_scanner_update_devices, self, 0);
+	g_signal_connect_object (_tmp9_, "update-devices", (GCallback) _simple_scan_update_scan_devices_cb_scanner_update_devices, self, 0);
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = self->priv->scanner;
+	_tmp10_ = self->priv->scanner;
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp8_, "request-authorization", (GCallback) _simple_scan_authorize_cb_scanner_request_authorization, self, 0);
+	g_signal_connect_object (_tmp10_, "request-authorization", (GCallback) _simple_scan_authorize_cb_scanner_request_authorization, self, 0);
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = self->priv->scanner;
+	_tmp11_ = self->priv->scanner;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp9_, "expect-page", (GCallback) _simple_scan_scanner_new_page_cb_scanner_expect_page, self, 0);
+	g_signal_connect_object (_tmp11_, "expect-page", (GCallback) _simple_scan_scanner_new_page_cb_scanner_expect_page, self, 0);
 #line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = self->priv->scanner;
+	_tmp12_ = self->priv->scanner;
 #line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp10_, "got-page-info", (GCallback) _simple_scan_scanner_page_info_cb_scanner_got_page_info, self, 0);
+	g_signal_connect_object (_tmp12_, "got-page-info", (GCallback) _simple_scan_scanner_page_info_cb_scanner_got_page_info, self, 0);
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = self->priv->scanner;
+	_tmp13_ = self->priv->scanner;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp11_, "got-line", (GCallback) _simple_scan_scanner_line_cb_scanner_got_line, self, 0);
+	g_signal_connect_object (_tmp13_, "got-line", (GCallback) _simple_scan_scanner_line_cb_scanner_got_line, self, 0);
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp12_ = self->priv->scanner;
+	_tmp14_ = self->priv->scanner;
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp12_, "page-done", (GCallback) _simple_scan_scanner_page_done_cb_scanner_page_done, self, 0);
+	g_signal_connect_object (_tmp14_, "page-done", (GCallback) _simple_scan_scanner_page_done_cb_scanner_page_done, self, 0);
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp13_ = self->priv->scanner;
+	_tmp15_ = self->priv->scanner;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp13_, "document-done", (GCallback) _simple_scan_scanner_document_done_cb_scanner_document_done, self, 0);
+	g_signal_connect_object (_tmp15_, "document-done", (GCallback) _simple_scan_scanner_document_done_cb_scanner_document_done, self, 0);
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp14_ = self->priv->scanner;
+	_tmp16_ = self->priv->scanner;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp14_, "scan-failed", (GCallback) _simple_scan_scanner_failed_cb_scanner_scan_failed, self, 0);
+	g_signal_connect_object (_tmp16_, "scan-failed", (GCallback) _simple_scan_scanner_failed_cb_scanner_scan_failed, self, 0);
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp15_ = self->priv->scanner;
+	_tmp17_ = self->priv->scanner;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp15_, "scanning-changed", (GCallback) _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed, self, 0);
+	g_signal_connect_object (_tmp17_, "scanning-changed", (GCallback) _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed, self, 0);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp16_ = g_strdup ("usb");
+	_tmp18_ = g_strdup ("usb");
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp17_ = g_new0 (gchar*, 2 + 1);
+	_tmp19_ = g_new0 (gchar*, 2 + 1);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp17_[0] = _tmp16_;
+	_tmp19_[0] = _tmp18_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp17_[1] = NULL;
+	_tmp19_[1] = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	subsystems = _tmp17_;
+	subsystems = _tmp19_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems_length1 = 2;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_subsystems_size_ = subsystems_length1;
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp18_ = subsystems;
+	_tmp20_ = subsystems;
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp18__length1 = subsystems_length1;
+	_tmp20__length1 = subsystems_length1;
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_ = g_udev_client_new (_tmp18_);
+	_tmp21_ = g_udev_client_new (_tmp20_);
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->udev_client = _tmp19_;
+	self->priv->udev_client = _tmp21_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp20_ = self->priv->udev_client;
+	_tmp22_ = self->priv->udev_client;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp20_, "uevent", (GCallback) _simple_scan_on_uevent_g_udev_client_uevent, self, 0);
+	g_signal_connect_object (_tmp22_, "uevent", (GCallback) _simple_scan_on_uevent_g_udev_client_uevent, self, 0);
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp21_ = self->priv->default_device;
+	_tmp23_ = self->priv->default_device;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp21_ != NULL) {
-#line 680 "simple-scan.c"
-		GList* device_list;
-		ScanDevice* _tmp22_;
-		ScanDevice* _tmp23_;
-		UserInterface* _tmp24_;
-		GList* _tmp25_;
-		UserInterface* _tmp26_;
-		ScanDevice* _tmp27_;
-		const gchar* _tmp28_;
+	if (_tmp23_ != NULL) {
+#line 698 "simple-scan.c"
+		GList* device_list = NULL;
+		ScanDevice* _tmp24_ = NULL;
+		ScanDevice* _tmp25_ = NULL;
+		UserInterface* _tmp26_ = NULL;
+		GList* _tmp27_ = NULL;
+		UserInterface* _tmp28_ = NULL;
+		ScanDevice* _tmp29_ = NULL;
+		const gchar* _tmp30_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device_list = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = self->priv->default_device;
+		_tmp24_ = self->priv->default_device;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = _scan_device_ref0 (_tmp22_);
+		_tmp25_ = _scan_device_ref0 (_tmp24_);
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device_list = g_list_append (device_list, _tmp23_);
+		device_list = g_list_append (device_list, _tmp25_);
 #line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = self->priv->ui;
+		_tmp26_ = self->priv->ui;
 #line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp25_ = device_list;
+		_tmp27_ = device_list;
 #line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_scan_devices (_tmp24_, _tmp25_);
+		user_interface_set_scan_devices (_tmp26_, _tmp27_);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = self->priv->ui;
+		_tmp28_ = self->priv->ui;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp27_ = self->priv->default_device;
+		_tmp29_ = self->priv->default_device;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp28_ = _tmp27_->name;
+		_tmp30_ = _tmp29_->name;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_selected_device (_tmp26_, _tmp28_);
+		user_interface_set_selected_device (_tmp28_, _tmp30_);
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		__g_list_free__scan_device_unref0_0 (device_list);
-#line 713 "simple-scan.c"
+#line 731 "simple-scan.c"
 	}
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems = (_vala_array_free (subsystems, subsystems_length1, (GDestroyNotify) g_free), NULL);
-#line 717 "simple-scan.c"
+#line 735 "simple-scan.c"
 }
 
 
 static void simple_scan_real_activate (GApplication* base) {
 	SimpleScan * self;
-	UserInterface* _tmp0_;
-	Scanner* _tmp1_;
+	UserInterface* _tmp0_ = NULL;
+	Scanner* _tmp1_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -733,13 +751,13 @@ static void simple_scan_real_activate (GApplication* base) {
 	_tmp1_ = self->priv->scanner;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_start (_tmp1_);
-#line 737 "simple-scan.c"
+#line 755 "simple-scan.c"
 }
 
 
 static void simple_scan_real_shutdown (GApplication* base) {
 	SimpleScan * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -760,19 +778,19 @@ static void simple_scan_real_shutdown (GApplication* base) {
 	_tmp0_ = self->priv->scanner;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_free (_tmp0_);
-#line 764 "simple-scan.c"
+#line 782 "simple-scan.c"
 }
 
 
 static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scanner, GList* devices) {
-	GList* _tmp0_;
+	GList* devices_copy = NULL;
+	GList* _tmp0_ = NULL;
 	GList* _tmp1_ = NULL;
-	GList* devices_copy;
-	ScanDevice* _tmp2_;
-	GList* _tmp10_;
+	ScanDevice* _tmp2_ = NULL;
+	GList* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
-	UserInterface* _tmp12_;
-	GList* _tmp13_;
+	UserInterface* _tmp12_ = NULL;
+	GList* _tmp13_ = NULL;
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -787,15 +805,15 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	_tmp2_ = self->priv->default_device;
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_ != NULL) {
-#line 791 "simple-scan.c"
-		gboolean default_in_list;
-		GList* _tmp3_;
-		gboolean _tmp8_;
+#line 809 "simple-scan.c"
+		gboolean default_in_list = FALSE;
+		GList* _tmp3_ = NULL;
+		gboolean _tmp8_ = FALSE;
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		default_in_list = FALSE;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = devices_copy;
-#line 799 "simple-scan.c"
+#line 817 "simple-scan.c"
 		{
 			GList* device_collection = NULL;
 			GList* device_it = NULL;
@@ -803,16 +821,16 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 			device_collection = _tmp3_;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 807 "simple-scan.c"
+#line 825 "simple-scan.c"
 				ScanDevice* device = NULL;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				device = (ScanDevice*) device_it->data;
-#line 811 "simple-scan.c"
+#line 829 "simple-scan.c"
 				{
-					ScanDevice* _tmp4_;
-					const gchar* _tmp5_;
-					ScanDevice* _tmp6_;
-					const gchar* _tmp7_;
+					ScanDevice* _tmp4_ = NULL;
+					const gchar* _tmp5_ = NULL;
+					ScanDevice* _tmp6_ = NULL;
+					const gchar* _tmp7_ = NULL;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp4_ = device;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -827,7 +845,7 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 						default_in_list = TRUE;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 831 "simple-scan.c"
+#line 849 "simple-scan.c"
 					}
 				}
 			}
@@ -836,13 +854,13 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 		_tmp8_ = default_in_list;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!_tmp8_) {
-#line 840 "simple-scan.c"
-			ScanDevice* _tmp9_;
+#line 858 "simple-scan.c"
+			ScanDevice* _tmp9_ = NULL;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp9_ = self->priv->default_device;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			devices_copy = g_list_prepend (devices_copy, _tmp9_);
-#line 846 "simple-scan.c"
+#line 864 "simple-scan.c"
 		}
 	}
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -859,18 +877,18 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	user_interface_set_scan_devices (_tmp12_, _tmp13_);
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_list_free0 (devices_copy);
-#line 863 "simple-scan.c"
+#line 881 "simple-scan.c"
 }
 
 
 static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const gchar* resource) {
 	gchar* username = NULL;
 	gchar* password = NULL;
-	UserInterface* _tmp0_;
-	const gchar* _tmp1_;
+	UserInterface* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	Scanner* _tmp4_;
+	Scanner* _tmp4_ = NULL;
 #line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
 #line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -899,39 +917,40 @@ static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const
 	_g_free0 (password);
 #line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
-#line 903 "simple-scan.c"
+#line 921 "simple-scan.c"
 }
 
 
 static Page* simple_scan_append_page (SimpleScan* self) {
 	Page* result = NULL;
-	Book* _tmp0_;
+	Page* page = NULL;
+	Book* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	Page* page;
 	gboolean _tmp2_ = FALSE;
-	Page* _tmp3_;
-	gboolean _tmp6_;
-	ScanDirection scan_direction;
-	gboolean do_crop;
-	gchar* named_crop;
-	gint width;
-	gint height;
-	gint dpi;
-	gint cx;
-	gint cy;
-	gint cw;
-	gint ch;
-	Page* _tmp10_;
-	Book* _tmp29_;
-	gint _tmp30_;
-	gint _tmp31_;
-	gint _tmp32_;
-	ScanDirection _tmp33_;
-	Page* _tmp34_ = NULL;
-	gboolean _tmp35_;
-	UserInterface* _tmp45_;
-	Page* _tmp46_;
-	Page* _tmp47_;
+	Page* _tmp3_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	ScanDirection scan_direction = 0;
+	gboolean do_crop = FALSE;
+	gchar* named_crop = NULL;
+	gint width = 0;
+	gint height = 0;
+	gint dpi = 0;
+	gint cx = 0;
+	gint cy = 0;
+	gint cw = 0;
+	gint ch = 0;
+	Page* _tmp11_ = NULL;
+	gint _tmp44_ = 0;
+	gint _tmp45_ = 0;
+	gint _tmp46_ = 0;
+	ScanDirection _tmp47_ = 0;
+	Page* _tmp48_ = NULL;
+	Book* _tmp49_ = NULL;
+	Page* _tmp50_ = NULL;
+	gboolean _tmp51_ = FALSE;
+	UserInterface* _tmp61_ = NULL;
+	Page* _tmp62_ = NULL;
+	Page* _tmp63_ = NULL;
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -944,44 +963,47 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	_tmp3_ = page;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp3_ != NULL) {
-#line 948 "simple-scan.c"
-		Page* _tmp4_;
+#line 967 "simple-scan.c"
+		Page* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = page;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp5_ = page_has_data (_tmp4_);
+		_tmp5_ = page_get_has_data (_tmp4_);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp2_ = !_tmp5_;
-#line 957 "simple-scan.c"
+		_tmp6_ = _tmp5_;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp2_ = !_tmp6_;
+#line 979 "simple-scan.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = FALSE;
-#line 961 "simple-scan.c"
+#line 983 "simple-scan.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp6_ = _tmp2_;
+	_tmp7_ = _tmp2_;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp6_) {
-#line 967 "simple-scan.c"
-		UserInterface* _tmp7_;
-		Page* _tmp8_;
-		Page* _tmp9_;
+	if (_tmp7_) {
+#line 989 "simple-scan.c"
+		UserInterface* _tmp8_ = NULL;
+		Page* _tmp9_ = NULL;
+		Page* _tmp10_ = NULL;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = self->priv->ui;
+		_tmp8_ = self->priv->ui;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = page;
+		_tmp9_ = page;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_selected_page (_tmp7_, _tmp8_);
+		user_interface_set_selected_page (_tmp8_, _tmp9_);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = page;
+		_tmp10_ = page;
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_start (_tmp9_);
+		page_start (_tmp10_);
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = page;
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 985 "simple-scan.c"
+#line 1007 "simple-scan.c"
 	}
 #line 139 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
@@ -1004,239 +1026,291 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	ch = 0;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = page;
+	_tmp11_ = page;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp10_ != NULL) {
-#line 1011 "simple-scan.c"
-		Page* _tmp11_;
-		ScanDirection _tmp12_ = 0;
-		Page* _tmp13_;
-		gint _tmp14_ = 0;
-		Page* _tmp15_;
+	if (_tmp11_ != NULL) {
+#line 1033 "simple-scan.c"
+		Page* _tmp12_ = NULL;
+		ScanDirection _tmp13_ = 0;
+		ScanDirection _tmp14_ = 0;
+		Page* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
-		Page* _tmp17_;
-		gint _tmp18_ = 0;
-		Page* _tmp19_;
-		gboolean _tmp20_ = FALSE;
-		gboolean _tmp21_;
+		gint _tmp17_ = 0;
+		Page* _tmp18_ = NULL;
+		gint _tmp19_ = 0;
+		gint _tmp20_ = 0;
+		Page* _tmp21_ = NULL;
+		gint _tmp22_ = 0;
+		gint _tmp23_ = 0;
+		Page* _tmp24_ = NULL;
+		gboolean _tmp25_ = FALSE;
+		gboolean _tmp26_ = FALSE;
+		gboolean _tmp27_ = FALSE;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp12_ = page;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = page;
+		_tmp13_ = page_get_scan_direction (_tmp12_);
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = page_get_scan_direction (_tmp11_);
+		_tmp14_ = _tmp13_;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		scan_direction = _tmp12_;
+		scan_direction = _tmp14_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp15_ = page;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = page;
+		_tmp16_ = page_get_width (_tmp15_);
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp14_ = page_get_width (_tmp13_);
+		_tmp17_ = _tmp16_;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		width = _tmp14_;
+		width = _tmp17_;
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = page;
+		_tmp18_ = page;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp19_ = page_get_height (_tmp18_);
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = page_get_height (_tmp15_);
+		_tmp20_ = _tmp19_;
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		height = _tmp16_;
+		height = _tmp20_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp17_ = page;
+		_tmp21_ = page;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = page_get_dpi (_tmp17_);
+		_tmp22_ = page_get_dpi (_tmp21_);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		dpi = _tmp18_;
+		_tmp23_ = _tmp22_;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		dpi = _tmp23_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp24_ = page;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp19_ = page;
+		_tmp25_ = page_get_has_crop (_tmp24_);
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp20_ = page_has_crop (_tmp19_);
+		_tmp26_ = _tmp25_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		do_crop = _tmp20_;
+		do_crop = _tmp26_;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp21_ = do_crop;
+		_tmp27_ = do_crop;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp21_) {
-#line 1057 "simple-scan.c"
-			Page* _tmp22_;
-			gchar* _tmp23_ = NULL;
-			Page* _tmp24_;
-			gint _tmp25_ = 0;
-			gint _tmp26_ = 0;
-			gint _tmp27_ = 0;
-			gint _tmp28_ = 0;
+		if (_tmp27_) {
+#line 1094 "simple-scan.c"
+			Page* _tmp28_ = NULL;
+			const gchar* _tmp29_ = NULL;
+			const gchar* _tmp30_ = NULL;
+			gchar* _tmp31_ = NULL;
+			Page* _tmp32_ = NULL;
+			gint _tmp33_ = 0;
+			gint _tmp34_ = 0;
+			Page* _tmp35_ = NULL;
+			gint _tmp36_ = 0;
+			gint _tmp37_ = 0;
+			Page* _tmp38_ = NULL;
+			gint _tmp39_ = 0;
+			gint _tmp40_ = 0;
+			Page* _tmp41_ = NULL;
+			gint _tmp42_ = 0;
+			gint _tmp43_ = 0;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp28_ = page;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp22_ = page;
+			_tmp29_ = page_get_crop_name (_tmp28_);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp23_ = page_get_named_crop (_tmp22_);
+			_tmp30_ = _tmp29_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp31_ = g_strdup (_tmp30_);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (named_crop);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			named_crop = _tmp23_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp24_ = page;
+			named_crop = _tmp31_;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_get_crop (_tmp24_, &_tmp25_, &_tmp26_, &_tmp27_, &_tmp28_);
+			_tmp32_ = page;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cx = _tmp25_;
+			_tmp33_ = page_get_crop_x (_tmp32_);
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cy = _tmp26_;
+			_tmp34_ = _tmp33_;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cw = _tmp27_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			ch = _tmp28_;
-#line 1085 "simple-scan.c"
+			cx = _tmp34_;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp35_ = page;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp36_ = page_get_crop_y (_tmp35_);
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp37_ = _tmp36_;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			cy = _tmp37_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp38_ = page;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp39_ = page_get_crop_width (_tmp38_);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp40_ = _tmp39_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			cw = _tmp40_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp41_ = page;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp42_ = page_get_crop_height (_tmp41_);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp43_ = _tmp42_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			ch = _tmp43_;
+#line 1155 "simple-scan.c"
 		}
 	}
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp29_ = self->priv->book;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp30_ = width;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp31_ = height;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp32_ = dpi;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp33_ = scan_direction;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp34_ = book_append_page (_tmp29_, _tmp30_, _tmp31_, _tmp32_, _tmp33_);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_page_unref0 (page);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp34_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp35_ = do_crop;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp35_) {
-#line 1108 "simple-scan.c"
-		const gchar* _tmp36_;
-		Page* _tmp42_;
-		gint _tmp43_;
-		gint _tmp44_;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp36_ = named_crop;
+	_tmp44_ = width;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp36_ != NULL) {
-#line 1117 "simple-scan.c"
-			Page* _tmp37_;
-			const gchar* _tmp38_;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp37_ = page;
+	_tmp45_ = height;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp46_ = dpi;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp47_ = scan_direction;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp48_ = page_new (_tmp44_, _tmp45_, _tmp46_, _tmp47_);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_page_unref0 (page);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	page = _tmp48_;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp49_ = self->priv->book;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp50_ = page;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	book_append_page (_tmp49_, _tmp50_);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp38_ = named_crop;
+	_tmp51_ = do_crop;
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_set_named_crop (_tmp37_, _tmp38_);
-#line 1126 "simple-scan.c"
-		} else {
-			Page* _tmp39_;
-			gint _tmp40_;
-			gint _tmp41_;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp39_ = page;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp40_ = cw;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp41_ = ch;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_set_custom_crop (_tmp39_, _tmp40_, _tmp41_);
-#line 1139 "simple-scan.c"
-		}
+	if (_tmp51_) {
+#line 1182 "simple-scan.c"
+		const gchar* _tmp52_ = NULL;
+		Page* _tmp58_ = NULL;
+		gint _tmp59_ = 0;
+		gint _tmp60_ = 0;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp52_ = named_crop;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		if (_tmp52_ != NULL) {
+#line 1191 "simple-scan.c"
+			Page* _tmp53_ = NULL;
+			const gchar* _tmp54_ = NULL;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp42_ = page;
+			_tmp53_ = page;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp43_ = cx;
+			_tmp54_ = named_crop;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp44_ = cy;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_move_crop (_tmp42_, _tmp43_, _tmp44_);
-#line 1149 "simple-scan.c"
-	}
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp45_ = self->priv->ui;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp46_ = page;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_selected_page (_tmp45_, _tmp46_);
+			page_set_named_crop (_tmp53_, _tmp54_);
+#line 1200 "simple-scan.c"
+		} else {
+			Page* _tmp55_ = NULL;
+			gint _tmp56_ = 0;
+			gint _tmp57_ = 0;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp55_ = page;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp47_ = page;
+			_tmp56_ = cw;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_start (_tmp47_);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp57_ = ch;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			page_set_custom_crop (_tmp55_, _tmp56_, _tmp57_);
+#line 1213 "simple-scan.c"
+		}
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp58_ = page;
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp59_ = cx;
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp60_ = cy;
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		page_move_crop (_tmp58_, _tmp59_, _tmp60_);
+#line 1223 "simple-scan.c"
+	}
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp61_ = self->priv->ui;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp62_ = page;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	user_interface_set_selected_page (_tmp61_, _tmp62_);
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp63_ = page;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	page_start (_tmp63_);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = page;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (named_crop);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 1167 "simple-scan.c"
+#line 1241 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner) {
 	Page* _tmp0_ = NULL;
-	Page* _tmp1_;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	Page* _tmp1_ = NULL;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = simple_scan_append_page (self);
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_;
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (_tmp1_);
-#line 1184 "simple-scan.c"
+#line 1258 "simple-scan.c"
 }
 
 
 static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar* device_name) {
 	gchar* result = NULL;
-	const gchar* _tmp0_;
+	gchar* device_id = NULL;
+	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-	gchar* device_id;
-	const gchar* _tmp2_;
-	CdClient* _tmp3_;
-	CdClient* client;
+	const gchar* _tmp2_ = NULL;
+	CdClient* client = NULL;
+	CdClient* _tmp3_ = NULL;
 	CdDevice* device = NULL;
-	CdDevice* _tmp18_;
+	CdProfile* profile = NULL;
+	CdDevice* _tmp18_ = NULL;
 	CdProfile* _tmp19_ = NULL;
-	CdProfile* profile;
-	CdProfile* _tmp20_;
-	CdProfile* _tmp26_;
-	const gchar* _tmp27_;
-	const gchar* _tmp28_;
-	CdProfile* _tmp30_;
-	const gchar* _tmp31_;
-	const gchar* _tmp32_;
-	const gchar* _tmp33_;
-	CdProfile* _tmp34_;
-	const gchar* _tmp35_;
-	const gchar* _tmp36_;
-	gchar* _tmp37_;
+	CdProfile* _tmp20_ = NULL;
+	CdProfile* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
+	const gchar* _tmp28_ = NULL;
+	CdProfile* _tmp30_ = NULL;
+	const gchar* _tmp31_ = NULL;
+	const gchar* _tmp32_ = NULL;
+	const gchar* _tmp33_ = NULL;
+	CdProfile* _tmp34_ = NULL;
+	const gchar* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
+	gchar* _tmp37_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (device_name != NULL, NULL);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = device_name;
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_strdup_printf ("sane:%s", _tmp0_);
-#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device_id = _tmp1_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device_name;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:184: Getting color profile for device %s", _tmp2_);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:188: Getting color profile for device %s", _tmp2_);
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = cd_client_new ();
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	client = _tmp3_;
-#line 1231 "simple-scan.c"
+#line 1305 "simple-scan.c"
 	{
-		CdClient* _tmp4_;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		CdClient* _tmp4_ = NULL;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = client;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1240 "simple-scan.c"
+#line 1314 "simple-scan.c"
 			goto __catch4_g_error;
 		}
 	}
@@ -1244,128 +1318,128 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	__catch4_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp5_;
-		const gchar* _tmp6_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		GError* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = e;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_->message;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:193: Failed to connect to colord: %s", _tmp6_);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:197: Failed to connect to colord: %s", _tmp6_);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1270 "simple-scan.c"
+#line 1344 "simple-scan.c"
 	}
 	__finally4:
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1285 "simple-scan.c"
+#line 1359 "simple-scan.c"
 	}
 	{
-		CdClient* _tmp7_;
-		const gchar* _tmp8_;
-		CdDevice* _tmp9_ = NULL;
-		CdDevice* _tmp10_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = client;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = device_id;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = cd_client_find_device_by_property_sync (_tmp7_, CD_DEVICE_PROPERTY_SERIAL, _tmp8_, NULL, &_inner_error_);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp10_ = _tmp9_;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		CdDevice* _tmp7_ = NULL;
+		CdClient* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		CdDevice* _tmp10_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp8_ = client;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp9_ = device_id;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp10_ = cd_client_find_device_by_property_sync (_tmp8_, CD_DEVICE_PROPERTY_SERIAL, _tmp9_, NULL, &_inner_error_);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp7_ = _tmp10_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1302 "simple-scan.c"
+#line 1376 "simple-scan.c"
 			goto __catch5_g_error;
 		}
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device = _tmp10_;
-#line 1309 "simple-scan.c"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		device = _tmp7_;
+#line 1383 "simple-scan.c"
 	}
 	goto __finally5;
 	__catch5_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp11_;
-		GError* _tmp12_;
-		const gchar* _tmp13_;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		const gchar* _tmp11_ = NULL;
+		GError* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = device_name;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = e;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = _tmp12_->message;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:204: Unable to find colord device %s: %s", _tmp11_, _tmp13_);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:208: Unable to find colord device %s: %s", _tmp11_, _tmp13_);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1342 "simple-scan.c"
+#line 1416 "simple-scan.c"
 	}
 	__finally5:
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1359 "simple-scan.c"
+#line 1433 "simple-scan.c"
 	}
 	{
-		CdDevice* _tmp14_;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		CdDevice* _tmp14_ = NULL;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = device;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_device_connect_sync (_tmp14_, NULL, &_inner_error_);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1369 "simple-scan.c"
+#line 1443 "simple-scan.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -1373,91 +1447,91 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	__catch6_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp15_;
-		GError* _tmp16_;
-		const gchar* _tmp17_;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		const gchar* _tmp15_ = NULL;
+		GError* _tmp16_ = NULL;
+		const gchar* _tmp17_ = NULL;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = device_name;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = e;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = _tmp16_->message;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:214: Failed to get properties from the device %s: %s", _tmp15_, _tmp17_);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:218: Failed to get properties from the device %s: %s", _tmp15_, _tmp17_);
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1404 "simple-scan.c"
+#line 1478 "simple-scan.c"
 	}
 	__finally6:
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1421 "simple-scan.c"
+#line 1495 "simple-scan.c"
 	}
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18_ = device;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = cd_device_get_default_profile (_tmp18_);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	profile = _tmp19_;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20_ = profile;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp20_ == NULL) {
-#line 1433 "simple-scan.c"
-		const gchar* _tmp21_;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 1507 "simple-scan.c"
+		const gchar* _tmp21_ = NULL;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp21_ = device_name;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:221: No default color profile for device: %s", _tmp21_);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:225: No default color profile for device: %s", _tmp21_);
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1451 "simple-scan.c"
+#line 1525 "simple-scan.c"
 	}
 	{
-		CdProfile* _tmp22_;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		CdProfile* _tmp22_ = NULL;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = profile;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_profile_connect_sync (_tmp22_, NULL, &_inner_error_);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1461 "simple-scan.c"
+#line 1535 "simple-scan.c"
 			goto __catch7_g_error;
 		}
 	}
@@ -1465,287 +1539,292 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	__catch7_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp23_;
-		GError* _tmp24_;
-		const gchar* _tmp25_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		const gchar* _tmp23_ = NULL;
+		GError* _tmp24_ = NULL;
+		const gchar* _tmp25_ = NULL;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = device_name;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = e;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = _tmp24_->message;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:231: Failed to get properties from the profile %s: %s", _tmp23_, _tmp25_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:235: Failed to get properties from the profile %s: %s", _tmp23_, _tmp25_);
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1498 "simple-scan.c"
+#line 1572 "simple-scan.c"
 	}
 	__finally7:
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1517 "simple-scan.c"
+#line 1591 "simple-scan.c"
 	}
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp26_ = profile;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp27_ = cd_profile_get_filename (_tmp26_);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = _tmp27_;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp28_ == NULL) {
-#line 1527 "simple-scan.c"
-		const gchar* _tmp29_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 1601 "simple-scan.c"
+		const gchar* _tmp29_ = NULL;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp29_ = device_name;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:237: No icc color profile for the device %s", _tmp29_);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:241: No icc color profile for the device %s", _tmp29_);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1545 "simple-scan.c"
+#line 1619 "simple-scan.c"
 	}
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp30_ = profile;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp31_ = cd_profile_get_filename (_tmp30_);
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp32_ = _tmp31_;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp33_ = device_name;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:241: Using color profile %s for device %s", _tmp32_, _tmp33_);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:245: Using color profile %s for device %s", _tmp32_, _tmp33_);
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp34_ = profile;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp35_ = cd_profile_get_filename (_tmp34_);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp36_ = _tmp35_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp37_ = g_strdup (_tmp36_);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp37_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (profile);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (device);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (client);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (device_id);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 1577 "simple-scan.c"
+#line 1651 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner, ScanPageInfo* info) {
-	ScanPageInfo* _tmp0_;
-	gint _tmp1_;
-	ScanPageInfo* _tmp2_;
-	gint _tmp3_;
-	ScanPageInfo* _tmp4_;
-	gint _tmp5_;
+	ScanPageInfo* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	ScanPageInfo* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	ScanPageInfo* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	Page* page = NULL;
 	Page* _tmp6_ = NULL;
-	Page* page;
-	ScanPageInfo* _tmp7_;
-	ScanPageInfo* _tmp8_;
-	const gchar* _tmp9_;
+	ScanPageInfo* _tmp7_ = NULL;
+	ScanPageInfo* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	gchar* _tmp11_ = NULL;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (info != NULL);
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = info;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->width;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = info;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_->height;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = info;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_->depth;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:250: Page is %d pixels wide, %d pixels high, %d bits " \
-"per pixel", _tmp1_, _tmp3_, _tmp5_);
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:254: Page is %d pixels wide, %d pixels high, %d bits " \
+"per pixel", _tmp1_, _tmp3_, _tmp5_);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = simple_scan_append_page (self);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp6_;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = info;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_page_info (page, _tmp7_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = info;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = _tmp8_->device;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = simple_scan_get_profile_for_device (self, _tmp9_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = _tmp10_;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_color_profile (page, _tmp11_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp11_);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1637 "simple-scan.c"
+#line 1711 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, ScanLine* line) {
-	Book* _tmp0_;
-	Book* _tmp1_;
+	Page* page = NULL;
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-	Page* _tmp3_ = NULL;
-	Page* page;
-	ScanLine* _tmp4_;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	guint _tmp3_ = 0U;
+	Page* _tmp4_ = NULL;
+	ScanLine* _tmp5_ = NULL;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (line != NULL);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = book_get_page (_tmp0_, ((gint) _tmp2_) - 1);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp3_;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = line;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_parse_scan_line (page, _tmp4_);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp3_ = _tmp2_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	page = _tmp4_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp5_ = line;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	page_parse_scan_line (page, _tmp5_);
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1670 "simple-scan.c"
+#line 1747 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner) {
-	Book* _tmp0_;
-	Book* _tmp1_;
+	Page* page = NULL;
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-	Page* _tmp3_ = NULL;
-	Page* page;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	guint _tmp3_ = 0U;
+	Page* _tmp4_ = NULL;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = book_get_page (_tmp0_, ((gint) _tmp2_) - 1);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp3_;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp3_ = _tmp2_;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	page = _tmp4_;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_finish (page);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1698 "simple-scan.c"
+#line 1778 "simple-scan.c"
 }
 
 
 static void simple_scan_remove_empty_page (SimpleScan* self) {
-	Book* _tmp0_;
-	Book* _tmp1_;
+	Page* page = NULL;
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-	Page* _tmp3_ = NULL;
-	Page* page;
-	Page* _tmp4_;
-	gboolean _tmp5_ = FALSE;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	guint _tmp3_ = 0U;
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp3_ = book_get_page (_tmp0_, ((gint) _tmp2_) - 1);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp3_;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp4_ = page;
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp5_ = page_has_data (_tmp4_);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp5_) {
-#line 1728 "simple-scan.c"
-		Page* _tmp6_;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp6_ = page;
+	_tmp3_ = _tmp2_;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_finish (_tmp6_);
-#line 1734 "simple-scan.c"
-	} else {
-		Book* _tmp7_;
-		Page* _tmp8_;
+	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	page = _tmp4_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp5_ = page;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp6_ = page_get_has_data (_tmp5_);
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp7_ = _tmp6_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (!_tmp7_) {
+#line 1814 "simple-scan.c"
+		Book* _tmp8_ = NULL;
+		Page* _tmp9_ = NULL;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp7_ = self->priv->book;
+		_tmp8_ = self->priv->book;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = page;
+		_tmp9_ = page;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		book_delete_page (_tmp7_, _tmp8_);
-#line 1744 "simple-scan.c"
+		book_delete_page (_tmp8_, _tmp9_);
+#line 1823 "simple-scan.c"
 	}
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1748 "simple-scan.c"
+#line 1827 "simple-scan.c"
 }
 
 
@@ -1756,12 +1835,12 @@ static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* sca
 	g_return_if_fail (scanner != NULL);
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
-#line 1759 "simple-scan.c"
+#line 1838 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, gint error_code, const gchar* error_string) {
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1774,11 +1853,11 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g
 	_tmp0_ = error_code;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp0_ != ((gint) SANE_STATUS_CANCELLED)) {
-#line 1777 "simple-scan.c"
-		UserInterface* _tmp1_;
+#line 1856 "simple-scan.c"
+		UserInterface* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_;
-		gboolean _tmp4_;
+		const gchar* _tmp3_ = NULL;
+		gboolean _tmp4_ = FALSE;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp1_ = self->priv->ui;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1789,14 +1868,14 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g
 		_tmp4_ = self->priv->have_devices;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_show_error (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1792 "simple-scan.c"
+#line 1871 "simple-scan.c"
 	}
 }
 
 
 static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner) {
-	UserInterface* _tmp0_;
-	Scanner* _tmp1_;
+	UserInterface* _tmp0_ = NULL;
+	Scanner* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
@@ -1810,30 +1889,30 @@ static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner*
 	_tmp2_ = scanner_is_scanning (_tmp1_);
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scanning (_tmp0_, _tmp2_);
-#line 1813 "simple-scan.c"
+#line 1892 "simple-scan.c"
 }
 
 
 static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gchar* device, ScanOptions* options) {
-	ScanOptions* _tmp0_;
-	gint _tmp1_;
-	const gchar* _tmp2_;
-	Scanner* _tmp3_;
+	ScanOptions* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	const gchar* _tmp2_ = NULL;
+	Scanner* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
+	gchar* filename_prefix = NULL;
 	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	gchar* filename_prefix;
+	gchar* _tmp8_ = NULL;
 	gchar* extension = NULL;
-	ScanOptions* _tmp9_;
-	ScanMode _tmp10_;
-	const gchar* _tmp13_;
-	const gchar* _tmp14_;
+	ScanOptions* _tmp9_ = NULL;
+	ScanMode _tmp10_ = 0;
+	gchar* filename = NULL;
+	const gchar* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
 	gchar* _tmp15_ = NULL;
-	gchar* filename;
-	UserInterface* _tmp16_;
-	Scanner* _tmp17_;
-	const gchar* _tmp18_;
-	ScanOptions* _tmp19_;
+	UserInterface* _tmp16_ = NULL;
+	Scanner* _tmp17_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	ScanOptions* _tmp19_ = NULL;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1854,16 +1933,16 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	_tmp4_ = scanner_is_scanning (_tmp3_);
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp4_) {
-#line 1857 "simple-scan.c"
+#line 1936 "simple-scan.c"
 		Page* _tmp5_ = NULL;
-		Page* _tmp6_;
+		Page* _tmp6_ = NULL;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = simple_scan_append_page (self);
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_page_unref0 (_tmp6_);
-#line 1866 "simple-scan.c"
+#line 1945 "simple-scan.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _ ("Scanned Document");
@@ -1877,24 +1956,24 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	_tmp10_ = _tmp9_->scan_mode;
 #line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ == SCAN_MODE_COLOR) {
-#line 1880 "simple-scan.c"
-		gchar* _tmp11_;
+#line 1959 "simple-scan.c"
+		gchar* _tmp11_ = NULL;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = g_strdup ("jpg");
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (extension);
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp11_;
-#line 1888 "simple-scan.c"
+#line 1967 "simple-scan.c"
 	} else {
-		gchar* _tmp12_;
+		gchar* _tmp12_ = NULL;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = g_strdup ("pdf");
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (extension);
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp12_;
-#line 1897 "simple-scan.c"
+#line 1976 "simple-scan.c"
 	}
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = filename_prefix;
@@ -1922,12 +2001,12 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	_g_free0 (extension);
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename_prefix);
-#line 1925 "simple-scan.c"
+#line 2004 "simple-scan.c"
 }
 
 
 static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1936,16 +2015,16 @@ static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
 	_tmp0_ = self->priv->scanner;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_cancel (_tmp0_);
-#line 1939 "simple-scan.c"
+#line 2018 "simple-scan.c"
 }
 
 
 static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar* prefix, const gchar* extension) {
 	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
+	gchar* filename = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gchar* filename;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1962,13 +2041,13 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp2_;
-#line 1965 "simple-scan.c"
+#line 2044 "simple-scan.c"
 	{
-		const gchar* _tmp3_;
+		gint fd = 0;
+		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-		gint fd;
-		gint _tmp6_;
+		gint _tmp6_ = 0;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = filename;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1981,21 +2060,21 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		fd = _tmp5_;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1984 "simple-scan.c"
+#line 2063 "simple-scan.c"
 			goto __catch8_g_error;
 		}
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = fd;
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		close (_tmp6_);
-#line 1991 "simple-scan.c"
+#line 2070 "simple-scan.c"
 	}
 	goto __finally8;
 	__catch8_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp7_;
-		const gchar* _tmp8_;
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2016,7 +2095,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		_g_free0 (filename);
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 2019 "simple-scan.c"
+#line 2098 "simple-scan.c"
 	}
 	__finally8:
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2031,7 +2110,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		g_clear_error (&_inner_error_);
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 2034 "simple-scan.c"
+#line 2113 "simple-scan.c"
 	}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = path;
@@ -2039,16 +2118,16 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	_g_free0 (filename);
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 2042 "simple-scan.c"
+#line 2121 "simple-scan.c"
 }
 
 
 static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gchar* profile, gint quality) {
-	gboolean saved;
-	gchar* _tmp0_;
-	gchar* command_line;
-	const gchar* _tmp1_;
-	const gchar* _tmp42_;
+	gboolean saved = FALSE;
+	gchar* command_line = NULL;
+	gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp43_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
@@ -2066,10 +2145,10 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	_tmp1_ = profile;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 2069 "simple-scan.c"
+#line 2148 "simple-scan.c"
+		gchar* path = NULL;
 		gchar* _tmp2_ = NULL;
-		gchar* path;
-		const gchar* _tmp3_;
+		const gchar* _tmp3_ = NULL;
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = simple_scan_get_temporary_filename (self, "scan", "pdf");
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2078,16 +2157,16 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 		_tmp3_ = path;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp3_ != NULL) {
-#line 2081 "simple-scan.c"
-			const gchar* _tmp4_;
+#line 2160 "simple-scan.c"
+			GFile* file = NULL;
+			const gchar* _tmp4_ = NULL;
 			GFile* _tmp5_ = NULL;
-			GFile* file;
-			UserInterface* _tmp6_;
-			const gchar* _tmp13_;
-			const gchar* _tmp14_;
+			UserInterface* _tmp6_ = NULL;
+			const gchar* _tmp13_ = NULL;
+			const gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-			gchar* _tmp16_;
-			gchar* _tmp17_;
+			gchar* _tmp16_ = NULL;
+			gchar* _tmp17_ = NULL;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = path;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2098,11 +2177,11 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			_tmp6_ = ui;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			user_interface_show_progress_dialog (_tmp6_);
-#line 2101 "simple-scan.c"
+#line 2180 "simple-scan.c"
 			{
-				Book* _tmp7_;
-				gint _tmp8_;
-				GFile* _tmp9_;
+				Book* _tmp7_ = NULL;
+				gint _tmp8_ = 0;
+				GFile* _tmp9_ = NULL;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp7_ = self->priv->book;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2113,7 +2192,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_inner_error_ != NULL) {
-#line 2116 "simple-scan.c"
+#line 2195 "simple-scan.c"
 					goto __catch9_g_error;
 				}
 			}
@@ -2121,9 +2200,9 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			__catch9_g_error:
 			{
 				GError* e = NULL;
-				UserInterface* _tmp10_;
-				GError* _tmp11_;
-				const gchar* _tmp12_;
+				UserInterface* _tmp10_ = NULL;
+				GError* _tmp11_ = NULL;
+				const gchar* _tmp12_ = NULL;
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				e = _inner_error_;
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2148,7 +2227,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				_g_free0 (command_line);
 #line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
-#line 2151 "simple-scan.c"
+#line 2230 "simple-scan.c"
 			}
 			__finally9:
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2165,7 +2244,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				g_clear_error (&_inner_error_);
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
-#line 2168 "simple-scan.c"
+#line 2247 "simple-scan.c"
 			}
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp13_ = command_line;
@@ -2185,51 +2264,52 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			_g_free0 (_tmp16_);
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_object_unref0 (file);
-#line 2188 "simple-scan.c"
+#line 2267 "simple-scan.c"
 		}
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 2192 "simple-scan.c"
+#line 2271 "simple-scan.c"
 	} else {
 		{
-			gint i;
+			gint i = 0;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			i = 0;
-#line 2198 "simple-scan.c"
+#line 2277 "simple-scan.c"
 			{
-				gboolean _tmp18_;
+				gboolean _tmp18_ = FALSE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp18_ = TRUE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				while (TRUE) {
-#line 2205 "simple-scan.c"
-					gboolean _tmp19_;
-					gint _tmp21_;
-					Book* _tmp22_;
+#line 2284 "simple-scan.c"
+					gboolean _tmp19_ = FALSE;
+					gint _tmp21_ = 0;
+					Book* _tmp22_ = NULL;
 					guint _tmp23_ = 0U;
-					gchar* _tmp24_ = NULL;
-					gchar* path;
-					const gchar* _tmp25_;
-					const gchar* _tmp26_;
-					GFile* _tmp27_ = NULL;
-					GFile* file;
-					const gchar* _tmp36_;
-					const gchar* _tmp37_;
-					gchar* _tmp38_ = NULL;
-					gchar* _tmp39_;
-					gchar* _tmp40_;
-					gboolean _tmp41_;
+					guint _tmp24_ = 0U;
+					gchar* path = NULL;
+					gchar* _tmp25_ = NULL;
+					const gchar* _tmp26_ = NULL;
+					GFile* file = NULL;
+					const gchar* _tmp27_ = NULL;
+					GFile* _tmp28_ = NULL;
+					const gchar* _tmp37_ = NULL;
+					const gchar* _tmp38_ = NULL;
+					gchar* _tmp39_ = NULL;
+					gchar* _tmp40_ = NULL;
+					gchar* _tmp41_ = NULL;
+					gboolean _tmp42_ = FALSE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp19_ = _tmp18_;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!_tmp19_) {
-#line 2226 "simple-scan.c"
-						gint _tmp20_;
+#line 2306 "simple-scan.c"
+						gint _tmp20_ = 0;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp20_ = i;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						i = _tmp20_ + 1;
-#line 2232 "simple-scan.c"
+#line 2312 "simple-scan.c"
 					}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = FALSE;
@@ -2240,60 +2320,62 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp23_ = book_get_n_pages (_tmp22_);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!(((guint) _tmp21_) < _tmp23_)) {
+					_tmp24_ = _tmp23_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (!(((guint) _tmp21_) < _tmp24_)) {
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2246 "simple-scan.c"
+#line 2328 "simple-scan.c"
 					}
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp24_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
+					_tmp25_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					path = _tmp24_;
+					path = _tmp25_;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp25_ = path;
+					_tmp26_ = path;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp25_ == NULL) {
+					if (_tmp26_ == NULL) {
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						saved = FALSE;
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2262 "simple-scan.c"
+#line 2344 "simple-scan.c"
 					}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp26_ = path;
+					_tmp27_ = path;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp27_ = g_file_new_for_path (_tmp26_);
+					_tmp28_ = g_file_new_for_path (_tmp27_);
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					file = _tmp27_;
-#line 2270 "simple-scan.c"
+					file = _tmp28_;
+#line 2352 "simple-scan.c"
 					{
-						Book* _tmp28_;
-						gint _tmp29_;
-						Page* _tmp30_ = NULL;
-						Page* _tmp31_;
-						gint _tmp32_;
-						GFile* _tmp33_;
+						Book* _tmp29_ = NULL;
+						gint _tmp30_ = 0;
+						Page* _tmp31_ = NULL;
+						Page* _tmp32_ = NULL;
+						gint _tmp33_ = 0;
+						GFile* _tmp34_ = NULL;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp28_ = self->priv->book;
+						_tmp29_ = self->priv->book;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp29_ = i;
+						_tmp30_ = i;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp30_ = book_get_page (_tmp28_, _tmp29_);
+						_tmp31_ = book_get_page (_tmp29_, _tmp30_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp31_ = _tmp30_;
+						_tmp32_ = _tmp31_;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp32_ = quality;
+						_tmp33_ = quality;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp33_ = file;
+						_tmp34_ = file;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						page_save (_tmp31_, "jpeg", _tmp32_, _tmp33_, &_inner_error_);
+						page_save (_tmp32_, "jpeg", _tmp33_, _tmp34_, &_inner_error_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_page_unref0 (_tmp31_);
+						_page_unref0 (_tmp32_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_inner_error_ != NULL) {
-#line 2296 "simple-scan.c"
+#line 2378 "simple-scan.c"
 							goto __catch10_g_error;
 						}
 					}
@@ -2301,18 +2383,18 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 					__catch10_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp34_;
-						const gchar* _tmp35_;
+						GError* _tmp35_ = NULL;
+						const gchar* _tmp36_ = NULL;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						e = _inner_error_;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_inner_error_ = NULL;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp34_ = e;
+						_tmp35_ = e;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp35_ = _tmp34_->message;
+						_tmp36_ = _tmp35_->message;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp35_);
+						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp36_);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_error_free0 (e);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2323,7 +2405,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						_g_free0 (command_line);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
-#line 2326 "simple-scan.c"
+#line 2408 "simple-scan.c"
 					}
 					__finally10:
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2340,59 +2422,59 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						g_clear_error (&_inner_error_);
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
-#line 2343 "simple-scan.c"
+#line 2425 "simple-scan.c"
 					}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp36_ = command_line;
+					_tmp37_ = command_line;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp37_ = path;
+					_tmp38_ = path;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp38_ = g_strdup_printf (" --attach %s", _tmp37_);
+					_tmp39_ = g_strdup_printf (" --attach %s", _tmp38_);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp39_ = _tmp38_;
+					_tmp40_ = _tmp39_;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
+					_tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (command_line);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					command_line = _tmp40_;
+					command_line = _tmp41_;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_free0 (_tmp39_);
+					_g_free0 (_tmp40_);
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp41_ = saved;
+					_tmp42_ = saved;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!_tmp41_) {
+					if (!_tmp42_) {
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2371 "simple-scan.c"
+#line 2453 "simple-scan.c"
 					}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_object_unref0 (file);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (path);
-#line 2377 "simple-scan.c"
+#line 2459 "simple-scan.c"
 				}
 			}
 		}
 	}
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp42_ = command_line;
+	_tmp43_ = command_line;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp42_);
-#line 2386 "simple-scan.c"
+	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp43_);
+#line 2468 "simple-scan.c"
 	{
-		const gchar* _tmp43_;
+		const gchar* _tmp44_ = NULL;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp43_ = command_line;
+		_tmp44_ = command_line;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_spawn_command_line_async (_tmp43_, &_inner_error_);
+		g_spawn_command_line_async (_tmp44_, &_inner_error_);
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 2395 "simple-scan.c"
+#line 2477 "simple-scan.c"
 			goto __catch11_g_error;
 		}
 	}
@@ -2400,21 +2482,21 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	__catch11_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp44_;
-		const gchar* _tmp45_;
+		GError* _tmp45_ = NULL;
+		const gchar* _tmp46_ = NULL;
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp44_ = e;
+		_tmp45_ = e;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp45_ = _tmp44_->message;
+		_tmp46_ = _tmp45_->message;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp45_);
+		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp46_);
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 2417 "simple-scan.c"
+#line 2499 "simple-scan.c"
 	}
 	__finally11:
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2427,23 +2509,23 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 		g_clear_error (&_inner_error_);
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2430 "simple-scan.c"
+#line 2512 "simple-scan.c"
 	}
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (command_line);
-#line 2434 "simple-scan.c"
+#line 2516 "simple-scan.c"
 }
 
 
 static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
 	gchar* prefix = NULL;
-	GLogLevelFlags _tmp0_;
-	FILE* _tmp8_;
-	GTimer* _tmp9_;
+	GLogLevelFlags _tmp0_ = 0;
+	FILE* _tmp8_ = NULL;
+	GTimer* _tmp9_ = NULL;
 	gdouble _tmp10_ = 0.0;
-	const gchar* _tmp11_;
-	const gchar* _tmp12_;
-	gboolean _tmp13_;
+	const gchar* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (message != NULL);
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2452,9 +2534,9 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	switch (_tmp0_ & G_LOG_LEVEL_MASK) {
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_ERROR:
-#line 2455 "simple-scan.c"
+#line 2537 "simple-scan.c"
 		{
-			gchar* _tmp1_;
+			gchar* _tmp1_ = NULL;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp1_ = g_strdup ("ERROR:");
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2463,13 +2545,13 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp1_;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2466 "simple-scan.c"
+#line 2548 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_CRITICAL:
-#line 2470 "simple-scan.c"
+#line 2552 "simple-scan.c"
 		{
-			gchar* _tmp2_;
+			gchar* _tmp2_ = NULL;
 #line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp2_ = g_strdup ("CRITICAL:");
 #line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2478,13 +2560,13 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp2_;
 #line 430 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2481 "simple-scan.c"
+#line 2563 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_WARNING:
-#line 2485 "simple-scan.c"
+#line 2567 "simple-scan.c"
 		{
-			gchar* _tmp3_;
+			gchar* _tmp3_ = NULL;
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp3_ = g_strdup ("WARNING:");
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2493,13 +2575,13 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp3_;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2496 "simple-scan.c"
+#line 2578 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_MESSAGE:
-#line 2500 "simple-scan.c"
+#line 2582 "simple-scan.c"
 		{
-			gchar* _tmp4_;
+			gchar* _tmp4_ = NULL;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = g_strdup ("MESSAGE:");
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2508,13 +2590,13 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp4_;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2511 "simple-scan.c"
+#line 2593 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_INFO:
-#line 2515 "simple-scan.c"
+#line 2597 "simple-scan.c"
 		{
-			gchar* _tmp5_;
+			gchar* _tmp5_ = NULL;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_strdup ("INFO:");
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2523,13 +2605,13 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp5_;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2526 "simple-scan.c"
+#line 2608 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_DEBUG:
-#line 2530 "simple-scan.c"
+#line 2612 "simple-scan.c"
 		{
-			gchar* _tmp6_;
+			gchar* _tmp6_ = NULL;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = g_strdup ("DEBUG:");
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2538,11 +2620,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp6_;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2541 "simple-scan.c"
+#line 2623 "simple-scan.c"
 		}
 		default:
 		{
-			gchar* _tmp7_;
+			gchar* _tmp7_ = NULL;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp7_ = g_strdup ("LOG:");
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2551,7 +2633,7 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp7_;
 #line 445 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2554 "simple-scan.c"
+#line 2636 "simple-scan.c"
 		}
 	}
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2570,12 +2652,12 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	_tmp13_ = simple_scan_debug_enabled;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp13_) {
-#line 2573 "simple-scan.c"
-		FILE* _tmp14_;
-		GTimer* _tmp15_;
+#line 2655 "simple-scan.c"
+		FILE* _tmp14_ = NULL;
+		GTimer* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
-		const gchar* _tmp17_;
-		const gchar* _tmp18_;
+		const gchar* _tmp17_ = NULL;
+		const gchar* _tmp18_ = NULL;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = stderr;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2588,16 +2670,16 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 		_tmp18_ = message;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp14_, "[%+.2fs] %s %s\n", _tmp16_, _tmp17_, _tmp18_);
-#line 2591 "simple-scan.c"
+#line 2673 "simple-scan.c"
 	}
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (prefix);
-#line 2595 "simple-scan.c"
+#line 2677 "simple-scan.c"
 }
 
 
 static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device) {
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2610,50 +2692,50 @@ static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const
 	_tmp0_ = self->priv->scanner;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_redetect (_tmp0_);
-#line 2613 "simple-scan.c"
+#line 2695 "simple-scan.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
-	gchar* _tmp0_;
-	glong _tmp1_;
+	gchar* end = NULL;
+	gchar* _tmp0_ = NULL;
+	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
-	gchar* end;
-	gchar* _tmp3_;
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	gchar* _tmp3_ = NULL;
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2636 "simple-scan.c"
-		glong _tmp4_;
-#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2718 "simple-scan.c"
+		glong _tmp4_ = 0L;
+#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 2644 "simple-scan.c"
+#line 2726 "simple-scan.c"
 	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 2656 "simple-scan.c"
+#line 2738 "simple-scan.c"
 	}
 }
 
@@ -2662,126 +2744,126 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	gboolean _tmp3_;
-	glong _tmp9_;
-	glong _tmp15_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	glong _tmp22_;
+	glong _tmp1_ = 0L;
+	gboolean _tmp3_ = FALSE;
+	glong _tmp9_ = 0L;
+	glong _tmp15_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	glong _tmp22_ = 0L;
 	gchar* _tmp23_ = NULL;
-#line 1168 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1167 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2681 "simple-scan.c"
-		glong _tmp2_;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2763 "simple-scan.c"
+		glong _tmp2_ = 0L;
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2687 "simple-scan.c"
+#line 2769 "simple-scan.c"
 	} else {
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2691 "simple-scan.c"
+#line 2773 "simple-scan.c"
 	}
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = _tmp0_;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp3_) {
-#line 2697 "simple-scan.c"
-		glong _tmp4_;
-		glong _tmp5_;
+#line 2779 "simple-scan.c"
+		glong _tmp4_ = 0L;
+		glong _tmp5_ = 0L;
 		glong _tmp6_ = 0L;
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = offset;
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp5_ = len;
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		string_length = _tmp6_;
-#line 2709 "simple-scan.c"
+#line 2791 "simple-scan.c"
 	} else {
-		gint _tmp7_;
-		gint _tmp8_;
-#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
+#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp7_ = strlen (self);
-#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp7_;
-#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp8_;
-#line 2719 "simple-scan.c"
+#line 2801 "simple-scan.c"
 	}
-#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp9_ = offset;
-#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp9_ < ((glong) 0)) {
-#line 2725 "simple-scan.c"
-		glong _tmp10_;
-		glong _tmp11_;
-		glong _tmp12_;
-#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2807 "simple-scan.c"
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+		glong _tmp12_ = 0L;
+#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp10_ = string_length;
-#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		offset = _tmp10_ + _tmp11_;
-#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
-#line 2739 "simple-scan.c"
+#line 2821 "simple-scan.c"
 	} else {
-		glong _tmp13_;
-		glong _tmp14_;
-#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		glong _tmp13_ = 0L;
+		glong _tmp14_ = 0L;
+#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp13_ = offset;
-#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp14_ = string_length;
-#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
-#line 2749 "simple-scan.c"
+#line 2831 "simple-scan.c"
 	}
-#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp15_ = len;
-#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp15_ < ((glong) 0)) {
-#line 2755 "simple-scan.c"
-		glong _tmp16_;
-		glong _tmp17_;
-#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2837 "simple-scan.c"
+		glong _tmp16_ = 0L;
+		glong _tmp17_ = 0L;
+#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
-#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp17_ = offset;
-#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		len = _tmp16_ - _tmp17_;
-#line 2764 "simple-scan.c"
+#line 2846 "simple-scan.c"
 	}
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp18_ = offset;
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp19_ = len;
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp20_ = string_length;
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp21_ = offset;
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp22_ = len;
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp23_;
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 2784 "simple-scan.c"
+#line 2866 "simple-scan.c"
 }
 
 
@@ -2789,30 +2871,30 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	guint8* data = NULL;
 	gint data_length1 = 0;
 	gint _data_size_ = 0;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	guint8* _tmp1_ = NULL;
 	size_t _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
+	FILE* fixed_file = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
 	FILE* _tmp6_ = NULL;
-	FILE* _tmp7_;
-	FILE* fixed_file;
-	gint offset;
-	gint line_number;
-	gint xref_offset;
-	gint xref_line;
-	GRegex* _tmp8_;
-	GRegex* xref_regex;
+	FILE* _tmp7_ = NULL;
+	gint offset = 0;
+	gint line_number = 0;
+	gint xref_offset = 0;
+	gint xref_line = 0;
+	GRegex* xref_regex = NULL;
+	GRegex* _tmp8_ = NULL;
 	GMatchInfo* xref_match = NULL;
-	GString* _tmp9_;
-	GString* line;
-	const gchar* _tmp84_;
-	const gchar* _tmp85_;
-	gchar* _tmp86_;
-	gchar* _tmp87_;
+	GString* line = NULL;
+	GString* _tmp9_ = NULL;
+	const gchar* _tmp84_ = NULL;
+	const gchar* _tmp85_ = NULL;
+	gchar* _tmp86_ = NULL;
+	gchar* _tmp87_ = NULL;
 	gint _tmp88_ = 0;
-	gboolean _tmp89_;
+	gboolean _tmp89_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (filename != NULL);
@@ -2836,7 +2918,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		data = (g_free (data), NULL);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2839 "simple-scan.c"
+#line 2921 "simple-scan.c"
 	}
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = filename;
@@ -2874,7 +2956,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		data = (g_free (data), NULL);
 #line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2877 "simple-scan.c"
+#line 2959 "simple-scan.c"
 	}
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = g_string_new ("");
@@ -2882,20 +2964,20 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	line = _tmp9_;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	while (TRUE) {
-#line 2885 "simple-scan.c"
-		gint _tmp10_;
-		guint8* _tmp11_;
-		gint _tmp11__length1;
-		gint _tmp12_;
-		gint end_offset;
-		GString* _tmp13_;
-		GString* _tmp23_;
-		const gchar* _tmp24_;
+#line 2967 "simple-scan.c"
+		gint _tmp10_ = 0;
+		guint8* _tmp11_ = NULL;
+		gint _tmp11__length1 = 0;
+		gint end_offset = 0;
+		gint _tmp12_ = 0;
+		GString* _tmp13_ = NULL;
+		GString* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
 		gboolean _tmp26_ = FALSE;
-		gint _tmp27_;
-		gboolean _tmp31_;
-		gint _tmp82_;
-		gint _tmp83_;
+		gint _tmp27_ = 0;
+		gboolean _tmp31_ = FALSE;
+		gint _tmp82_ = 0;
+		gint _tmp83_ = 0;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = offset;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2906,7 +2988,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		if (!(_tmp10_ < _tmp11__length1)) {
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2909 "simple-scan.c"
+#line 2991 "simple-scan.c"
 		}
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = offset;
@@ -2918,19 +3000,19 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		g_string_assign (_tmp13_, "");
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		while (TRUE) {
-#line 2921 "simple-scan.c"
-			gint _tmp14_;
-			guint8* _tmp15_;
-			gint _tmp15__length1;
-			guint8* _tmp16_;
-			gint _tmp16__length1;
-			gint _tmp17_;
-			guint8 _tmp18_;
-			guint8 c;
-			GString* _tmp19_;
-			guint8 _tmp20_;
-			gint _tmp21_;
-			guint8 _tmp22_;
+#line 3003 "simple-scan.c"
+			gint _tmp14_ = 0;
+			guint8* _tmp15_ = NULL;
+			gint _tmp15__length1 = 0;
+			guint8 c = 0U;
+			guint8* _tmp16_ = NULL;
+			gint _tmp16__length1 = 0;
+			gint _tmp17_ = 0;
+			guint8 _tmp18_ = 0U;
+			GString* _tmp19_ = NULL;
+			guint8 _tmp20_ = 0U;
+			gint _tmp21_ = 0;
+			guint8 _tmp22_ = 0U;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp14_ = end_offset;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2941,7 +3023,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			if (!(_tmp14_ < _tmp15__length1)) {
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
-#line 2944 "simple-scan.c"
+#line 3026 "simple-scan.c"
 			}
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16_ = data;
@@ -2969,7 +3051,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			if (_tmp22_ == ((guint8) '\n')) {
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
-#line 2972 "simple-scan.c"
+#line 3054 "simple-scan.c"
 			}
 		}
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2978,21 +3060,21 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		_tmp24_ = _tmp23_->str;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (g_strcmp0 (_tmp24_, "startxref\n") == 0) {
-#line 2981 "simple-scan.c"
-			gint _tmp25_;
+#line 3063 "simple-scan.c"
+			gint _tmp25_ = 0;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = line_number;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_line = _tmp25_;
-#line 2987 "simple-scan.c"
+#line 3069 "simple-scan.c"
 		}
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp27_ = line_number;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp27_ < 2) {
-#line 2993 "simple-scan.c"
-			GString* _tmp28_;
-			const gchar* _tmp29_;
+#line 3075 "simple-scan.c"
+			GString* _tmp28_ = NULL;
+			const gchar* _tmp29_ = NULL;
 			gboolean _tmp30_ = FALSE;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = line;
@@ -3002,23 +3084,23 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			_tmp30_ = g_str_has_prefix (_tmp29_, "%%");
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = _tmp30_;
-#line 3005 "simple-scan.c"
+#line 3087 "simple-scan.c"
 		} else {
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = FALSE;
-#line 3009 "simple-scan.c"
+#line 3091 "simple-scan.c"
 		}
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_ = _tmp26_;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp31_) {
-#line 3015 "simple-scan.c"
-			gint _tmp32_;
-			FILE* _tmp33_;
-			GString* _tmp34_;
-			const gchar* _tmp35_;
+#line 3097 "simple-scan.c"
+			gint _tmp32_ = 0;
+			FILE* _tmp33_ = NULL;
+			GString* _tmp34_ = NULL;
+			const gchar* _tmp35_ = NULL;
 			gchar* _tmp36_ = NULL;
-			gchar* _tmp37_;
+			gchar* _tmp37_ = NULL;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp32_ = xref_offset;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3037,11 +3119,11 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			fprintf (_tmp33_, "%s", _tmp37_);
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (_tmp37_);
-#line 3040 "simple-scan.c"
+#line 3122 "simple-scan.c"
 		} else {
-			GRegex* _tmp38_;
-			GString* _tmp39_;
-			const gchar* _tmp40_;
+			GRegex* _tmp38_ = NULL;
+			GString* _tmp39_ = NULL;
+			const gchar* _tmp40_ = NULL;
 			GMatchInfo* _tmp41_ = NULL;
 			gboolean _tmp42_ = FALSE;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3053,17 +3135,17 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp42_ = g_regex_match (_tmp38_, _tmp40_, 0, &_tmp41_);
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_match_info_free0 (xref_match);
+			_g_match_info_unref0 (xref_match);
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_match = _tmp41_;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp42_) {
-#line 3061 "simple-scan.c"
-				FILE* _tmp43_;
-				GMatchInfo* _tmp44_;
+#line 3143 "simple-scan.c"
+				FILE* _tmp43_ = NULL;
+				GMatchInfo* _tmp44_ = NULL;
 				const gchar* _tmp45_ = NULL;
 				gint _tmp46_ = 0;
-				gint _tmp47_;
+				gint _tmp47_ = 0;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp43_ = fixed_file;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3076,42 +3158,42 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				_tmp47_ = xref_offset;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fprintf (_tmp43_, "%010d 00000 n \n", _tmp46_ + _tmp47_);
-#line 3079 "simple-scan.c"
+#line 3161 "simple-scan.c"
 			} else {
 				gboolean _tmp48_ = FALSE;
-				gint _tmp49_;
-				gboolean _tmp52_;
+				gint _tmp49_ = 0;
+				gboolean _tmp52_ = FALSE;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp49_ = xref_line;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp49_ > 0) {
-#line 3088 "simple-scan.c"
-					gint _tmp50_;
-					gint _tmp51_;
+#line 3170 "simple-scan.c"
+					gint _tmp50_ = 0;
+					gint _tmp51_ = 0;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp50_ = line_number;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp51_ = xref_line;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp48_ = _tmp50_ == (_tmp51_ + 1);
-#line 3097 "simple-scan.c"
+#line 3179 "simple-scan.c"
 				} else {
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp48_ = FALSE;
-#line 3101 "simple-scan.c"
+#line 3183 "simple-scan.c"
 				}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp52_ = _tmp48_;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp52_) {
-#line 3107 "simple-scan.c"
-					FILE* _tmp53_;
-					GString* _tmp54_;
-					const gchar* _tmp55_;
+#line 3189 "simple-scan.c"
+					FILE* _tmp53_ = NULL;
+					GString* _tmp54_ = NULL;
+					const gchar* _tmp55_ = NULL;
 					gint _tmp56_ = 0;
-					gint _tmp57_;
+					gint _tmp57_ = 0;
 					gchar* _tmp58_ = NULL;
-					gchar* _tmp59_;
+					gchar* _tmp59_ = NULL;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp53_ = fixed_file;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3130,21 +3212,21 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 					fprintf (_tmp53_, "%s", _tmp59_);
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (_tmp59_);
-#line 3133 "simple-scan.c"
+#line 3215 "simple-scan.c"
 				} else {
 					gboolean _tmp60_ = FALSE;
-					gint _tmp61_;
-					gint _tmp62_;
-					gboolean _tmp66_;
+					gint _tmp61_ = 0;
+					gint _tmp62_ = 0;
+					gboolean _tmp66_ = FALSE;
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp61_ = line_number;
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp62_ = xref_line;
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp61_ == (_tmp62_ + 2)) {
-#line 3145 "simple-scan.c"
-						GString* _tmp63_;
-						const gchar* _tmp64_;
+#line 3227 "simple-scan.c"
+						GString* _tmp63_ = NULL;
+						const gchar* _tmp64_ = NULL;
 						gboolean _tmp65_ = FALSE;
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp63_ = line;
@@ -3154,22 +3236,22 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 						_tmp65_ = g_str_has_prefix (_tmp64_, "%%%%");
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp60_ = _tmp65_;
-#line 3157 "simple-scan.c"
+#line 3239 "simple-scan.c"
 					} else {
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp60_ = FALSE;
-#line 3161 "simple-scan.c"
+#line 3243 "simple-scan.c"
 					}
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp66_ = _tmp60_;
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp66_) {
-#line 3167 "simple-scan.c"
-						FILE* _tmp67_;
-						GString* _tmp68_;
-						const gchar* _tmp69_;
+#line 3249 "simple-scan.c"
+						FILE* _tmp67_ = NULL;
+						GString* _tmp68_ = NULL;
+						const gchar* _tmp69_ = NULL;
 						gchar* _tmp70_ = NULL;
-						gchar* _tmp71_;
+						gchar* _tmp71_ = NULL;
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp67_ = fixed_file;
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3184,42 +3266,42 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 						fprintf (_tmp67_, "%s", _tmp71_);
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (_tmp71_);
-#line 3187 "simple-scan.c"
+#line 3269 "simple-scan.c"
 					} else {
 						{
-							gint _tmp72_;
-							gint i;
+							gint i = 0;
+							gint _tmp72_ = 0;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp72_ = offset;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp72_;
-#line 3196 "simple-scan.c"
+#line 3278 "simple-scan.c"
 							{
-								gboolean _tmp73_;
+								gboolean _tmp73_ = FALSE;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp73_ = TRUE;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								while (TRUE) {
-#line 3203 "simple-scan.c"
-									gboolean _tmp74_;
-									gint _tmp76_;
-									gint _tmp77_;
-									FILE* _tmp78_;
-									guint8* _tmp79_;
-									gint _tmp79__length1;
-									gint _tmp80_;
-									guint8 _tmp81_;
+#line 3285 "simple-scan.c"
+									gboolean _tmp74_ = FALSE;
+									gint _tmp76_ = 0;
+									gint _tmp77_ = 0;
+									FILE* _tmp78_ = NULL;
+									guint8* _tmp79_ = NULL;
+									gint _tmp79__length1 = 0;
+									gint _tmp80_ = 0;
+									guint8 _tmp81_ = 0U;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp74_ = _tmp73_;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									if (!_tmp74_) {
-#line 3216 "simple-scan.c"
-										gint _tmp75_;
+#line 3298 "simple-scan.c"
+										gint _tmp75_ = 0;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										_tmp75_ = i;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										i = _tmp75_ + 1;
-#line 3222 "simple-scan.c"
+#line 3304 "simple-scan.c"
 									}
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp73_ = FALSE;
@@ -3231,7 +3313,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 									if (!(_tmp76_ < _tmp77_)) {
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										break;
-#line 3234 "simple-scan.c"
+#line 3316 "simple-scan.c"
 									}
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp78_ = fixed_file;
@@ -3245,7 +3327,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 									_tmp81_ = _tmp79_[_tmp80_];
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									fputc ((gchar) _tmp81_, _tmp78_);
-#line 3248 "simple-scan.c"
+#line 3330 "simple-scan.c"
 								}
 							}
 						}
@@ -3261,7 +3343,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		_tmp83_ = end_offset;
 #line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		offset = _tmp83_;
-#line 3264 "simple-scan.c"
+#line 3346 "simple-scan.c"
 	}
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp84_ = filename;
@@ -3279,11 +3361,11 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	_g_free0 (_tmp87_);
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp89_) {
-#line 3282 "simple-scan.c"
-		const gchar* _tmp90_;
-		gchar* _tmp91_;
-		gchar* _tmp92_;
-		const gchar* _tmp93_;
+#line 3364 "simple-scan.c"
+		const gchar* _tmp90_ = NULL;
+		gchar* _tmp91_ = NULL;
+		gchar* _tmp92_ = NULL;
+		const gchar* _tmp93_ = NULL;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp90_ = filename;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3296,56 +3378,56 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		g_rename (_tmp92_, _tmp93_);
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp92_);
-#line 3299 "simple-scan.c"
+#line 3381 "simple-scan.c"
 	}
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_string_free0 (line);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_match_info_free0 (xref_match);
+	_g_match_info_unref0 (xref_match);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_regex_unref0 (xref_regex);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (fixed_file);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
-#line 3311 "simple-scan.c"
+#line 3393 "simple-scan.c"
 }
 
 
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_cb (log_domain, log_levels, message);
-#line 3318 "simple-scan.c"
+#line 3400 "simple-scan.c"
 }
 
 
 gint simple_scan_main (gchar** args, int args_length1) {
 	gint result = 0;
+	GOptionContext* c = NULL;
 	const gchar* _tmp0_ = NULL;
-	GOptionContext* _tmp1_;
-	GOptionContext* c;
-	GOptionContext* _tmp2_;
-	GOptionContext* _tmp3_;
+	GOptionContext* _tmp1_ = NULL;
+	GOptionContext* _tmp2_ = NULL;
+	GOptionContext* _tmp3_ = NULL;
 	GOptionGroup* _tmp4_ = NULL;
-	gboolean _tmp14_;
-	const gchar* _tmp16_;
-	ScanDevice* device;
-	gchar** _tmp29_;
-	gint _tmp29__length1;
-	GTimer* _tmp39_;
+	gboolean _tmp14_ = FALSE;
+	const gchar* _tmp16_ = NULL;
+	ScanDevice* device = NULL;
+	gchar** _tmp29_ = NULL;
+	gint _tmp29__length1 = 0;
+	GTimer* _tmp39_ = NULL;
+	gchar* path = NULL;
 	const gchar* _tmp40_ = NULL;
 	gchar* _tmp41_ = NULL;
-	gchar* path;
-	const gchar* _tmp42_;
+	const gchar* _tmp42_ = NULL;
 	const gchar* _tmp43_ = NULL;
 	gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_;
+	const gchar* _tmp45_ = NULL;
 	FILE* _tmp46_ = NULL;
 	pid_t _tmp47_ = 0;
-	ScanDevice* _tmp48_;
-	SimpleScan* _tmp49_;
-	SimpleScan* app;
-	SimpleScan* _tmp50_;
+	SimpleScan* app = NULL;
+	ScanDevice* _tmp48_ = NULL;
+	SimpleScan* _tmp49_ = NULL;
+	SimpleScan* _tmp50_ = NULL;
 	gint _tmp51_ = 0;
 	GError * _inner_error_ = NULL;
 #line 521 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3374,16 +3456,16 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	_tmp4_ = gtk_get_option_group (TRUE);
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_group (_tmp3_, _tmp4_);
-#line 3377 "simple-scan.c"
+#line 3459 "simple-scan.c"
 	{
-		GOptionContext* _tmp5_;
+		GOptionContext* _tmp5_ = NULL;
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = c;
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 3386 "simple-scan.c"
+#line 3468 "simple-scan.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -3391,15 +3473,15 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	__catch12_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp6_;
-		GError* _tmp7_;
-		const gchar* _tmp8_;
-		FILE* _tmp9_;
+		FILE* _tmp6_ = NULL;
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
+		FILE* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-		gchar** _tmp11_;
-		gint _tmp11__length1;
-		const gchar* _tmp12_;
-		FILE* _tmp13_;
+		gchar** _tmp11_ = NULL;
+		gint _tmp11__length1 = 0;
+		const gchar* _tmp12_ = NULL;
+		FILE* _tmp13_ = NULL;
 #line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3436,7 +3518,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (c);
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3439 "simple-scan.c"
+#line 3521 "simple-scan.c"
 	}
 	__finally12:
 #line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3449,14 +3531,14 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		g_clear_error (&_inner_error_);
 #line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return 0;
-#line 3452 "simple-scan.c"
+#line 3534 "simple-scan.c"
 	}
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = simple_scan_show_version;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp14_) {
-#line 3458 "simple-scan.c"
-		FILE* _tmp15_;
+#line 3540 "simple-scan.c"
+		FILE* _tmp15_ = NULL;
 #line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = stderr;
 #line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3467,55 +3549,55 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (c);
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3470 "simple-scan.c"
+#line 3552 "simple-scan.c"
 	}
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = simple_scan_fix_pdf_filename;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp16_ != NULL) {
-#line 3476 "simple-scan.c"
+#line 3558 "simple-scan.c"
 		{
-			const gchar* _tmp17_;
+			const gchar* _tmp17_ = NULL;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = simple_scan_fix_pdf_filename;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_inner_error_ != NULL) {
-#line 3485 "simple-scan.c"
+#line 3567 "simple-scan.c"
 				goto __catch13_g_error;
 			}
 			{
-				gint i;
+				gint i = 0;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
-#line 3492 "simple-scan.c"
+#line 3574 "simple-scan.c"
 				{
-					gboolean _tmp18_;
+					gboolean _tmp18_ = FALSE;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = TRUE;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
-#line 3499 "simple-scan.c"
-						gboolean _tmp19_;
-						gint _tmp21_;
-						gchar** _tmp22_;
-						gint _tmp22__length1;
-						gchar** _tmp23_;
-						gint _tmp23__length1;
-						gint _tmp24_;
-						const gchar* _tmp25_;
+#line 3581 "simple-scan.c"
+						gboolean _tmp19_ = FALSE;
+						gint _tmp21_ = 0;
+						gchar** _tmp22_ = NULL;
+						gint _tmp22__length1 = 0;
+						gchar** _tmp23_ = NULL;
+						gint _tmp23__length1 = 0;
+						gint _tmp24_ = 0;
+						const gchar* _tmp25_ = NULL;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp19_ = _tmp18_;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!_tmp19_) {
-#line 3512 "simple-scan.c"
-							gint _tmp20_;
+#line 3594 "simple-scan.c"
+							gint _tmp20_ = 0;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp20_ = i;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp20_ + 1;
-#line 3518 "simple-scan.c"
+#line 3600 "simple-scan.c"
 						}
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp18_ = FALSE;
@@ -3529,7 +3611,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 						if (!(_tmp21_ < _tmp22__length1)) {
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
-#line 3532 "simple-scan.c"
+#line 3614 "simple-scan.c"
 						}
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp23_ = args;
@@ -3543,7 +3625,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 						simple_scan_fix_pdf (_tmp25_, &_inner_error_);
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_inner_error_ != NULL) {
-#line 3546 "simple-scan.c"
+#line 3628 "simple-scan.c"
 							goto __catch13_g_error;
 						}
 					}
@@ -3554,9 +3636,9 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		__catch13_g_error:
 		{
 			GError* e = NULL;
-			FILE* _tmp26_;
-			GError* _tmp27_;
-			const gchar* _tmp28_;
+			FILE* _tmp26_ = NULL;
+			GError* _tmp27_ = NULL;
+			const gchar* _tmp28_ = NULL;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3577,7 +3659,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 			_g_option_context_free0 (c);
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
-#line 3580 "simple-scan.c"
+#line 3662 "simple-scan.c"
 		}
 		__finally13:
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3590,7 +3672,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 			g_clear_error (&_inner_error_);
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return 0;
-#line 3593 "simple-scan.c"
+#line 3675 "simple-scan.c"
 		}
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
@@ -3598,7 +3680,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (c);
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3601 "simple-scan.c"
+#line 3683 "simple-scan.c"
 	}
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
@@ -3608,18 +3690,18 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	_tmp29__length1 = args_length1;
 #line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp29__length1 > 1) {
-#line 3611 "simple-scan.c"
-		ScanDevice* _tmp30_;
-		ScanDevice* _tmp31_;
-		gchar** _tmp32_;
-		gint _tmp32__length1;
-		const gchar* _tmp33_;
-		gchar* _tmp34_;
-		ScanDevice* _tmp35_;
-		gchar** _tmp36_;
-		gint _tmp36__length1;
-		const gchar* _tmp37_;
-		gchar* _tmp38_;
+#line 3693 "simple-scan.c"
+		ScanDevice* _tmp30_ = NULL;
+		ScanDevice* _tmp31_ = NULL;
+		gchar** _tmp32_ = NULL;
+		gint _tmp32__length1 = 0;
+		const gchar* _tmp33_ = NULL;
+		gchar* _tmp34_ = NULL;
+		ScanDevice* _tmp35_ = NULL;
+		gchar** _tmp36_ = NULL;
+		gint _tmp36__length1 = 0;
+		const gchar* _tmp37_ = NULL;
+		gchar* _tmp38_ = NULL;
 #line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = scan_device_new ();
 #line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3654,7 +3736,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		_g_free0 (_tmp35_->label);
 #line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35_->label = _tmp38_;
-#line 3657 "simple-scan.c"
+#line 3739 "simple-scan.c"
 	}
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp39_ = g_timer_new ();
@@ -3716,7 +3798,7 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	_g_option_context_free0 (c);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 3719 "simple-scan.c"
+#line 3801 "simple-scan.c"
 }
 
 
@@ -3725,7 +3807,7 @@ int main (int argc, char ** argv) {
 	g_type_init ();
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_main (argv, argc);
-#line 3728 "simple-scan.c"
+#line 3810 "simple-scan.c"
 }
 
 
@@ -3742,7 +3824,7 @@ static void simple_scan_class_init (SimpleScanClass * klass) {
 	G_APPLICATION_CLASS (klass)->shutdown = simple_scan_real_shutdown;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_scan_finalize;
-#line 3745 "simple-scan.c"
+#line 3827 "simple-scan.c"
 }
 
 
@@ -3753,7 +3835,7 @@ static void simple_scan_instance_init (SimpleScan * self) {
 	self->priv->default_device = NULL;
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = FALSE;
-#line 3756 "simple-scan.c"
+#line 3838 "simple-scan.c"
 }
 
 
@@ -3773,7 +3855,7 @@ static void simple_scan_finalize (GObject* obj) {
 	_book_unref0 (self->priv->book);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (simple_scan_parent_class)->finalize (obj);
-#line 3776 "simple-scan.c"
+#line 3858 "simple-scan.c"
 }
 
 
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 14e70ea..5ae73ab 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -46,7 +46,7 @@ public class SimpleScan : Gtk.Application
         base.startup ();
 
         ui = new UserInterface ();
-        book = ui.get_book ();
+        book = ui.book;
         ui.start_scan.connect (scan_cb);
         ui.stop_scan.connect (cancel_cb);
         ui.email.connect (email_cb);
@@ -72,7 +72,7 @@ public class SimpleScan : Gtk.Application
 
             device_list.append (default_device);
             ui.set_scan_devices (device_list);
-            ui.set_selected_device (default_device.name);
+            ui.selected_device = default_device.name;
         }
     }
 
@@ -128,9 +128,9 @@ public class SimpleScan : Gtk.Application
     {
         /* Use current page if not used */
         var page = book.get_page (-1);
-        if (page != null && !page.has_data ())
+        if (page != null && !page.has_data)
         {
-            ui.set_selected_page (page);
+            ui.selected_page = page;
             page.start ();
             return page;
         }
@@ -142,20 +142,24 @@ public class SimpleScan : Gtk.Application
         var width = 100, height = 100, dpi = 100, cx = 0, cy = 0, cw = 0, ch = 0;
         if (page != null)
         {
-            scan_direction = page.get_scan_direction ();
-            width = page.get_width ();
-            height = page.get_height ();
-            dpi = page.get_dpi ();
+            scan_direction = page.scan_direction;
+            width = page.width;
+            height = page.height;
+            dpi = page.dpi;
 
-            do_crop = page.has_crop ();
+            do_crop = page.has_crop;
             if (do_crop)
             {
-                named_crop = page.get_named_crop ();
-                page.get_crop (out cx, out cy, out cw, out ch);
+                named_crop = page.crop_name;
+                cx = page.crop_x;
+                cy = page.crop_y;
+                cw = page.crop_width;
+                ch = page.crop_height;
             }
         }
 
-        page = book.append_page (width, height, dpi, scan_direction);
+        page = new Page (width, height, dpi, scan_direction);
+        book.append_page (page);
         if (do_crop)
         {
             if (named_crop != null)
@@ -166,7 +170,7 @@ public class SimpleScan : Gtk.Application
                 page.set_custom_crop (cw, ch);
             page.move_crop (cx, cy);
         }
-        ui.set_selected_page (page);
+        ui.selected_page = page;
         page.start ();
 
         return page;
@@ -257,29 +261,25 @@ public class SimpleScan : Gtk.Application
         /* Get ICC color profile */
         /* FIXME: The ICC profile could change */
         /* FIXME: Don't do a D-bus call for each page, cache color profiles */
-        page.set_color_profile (get_profile_for_device (info.device));
+        page.color_profile = get_profile_for_device (info.device);
     }
 
     private void scanner_line_cb (Scanner scanner, ScanLine line)
     {
-        var page = book.get_page ((int) book.get_n_pages () - 1);
+        var page = book.get_page ((int) book.n_pages - 1);
         page.parse_scan_line (line);
     }
 
     private void scanner_page_done_cb (Scanner scanner)
     {
-        var page = book.get_page ((int) book.get_n_pages () - 1);
+        var page = book.get_page ((int) book.n_pages - 1);
         page.finish ();
     }
 
     private void remove_empty_page ()
     {
-        var page = book.get_page ((int) book.get_n_pages () - 1);
-
-        /* Remove a failed page */
-        if (page.has_data ())
-            page.finish ();
-        else
+        var page = book.get_page ((int) book.n_pages - 1);
+        if (!page.has_data)
             book.delete_page (page);
     }
 
@@ -302,7 +302,7 @@ public class SimpleScan : Gtk.Application
 
     private void scanner_scanning_changed_cb (Scanner scanner)
     {
-        ui.set_scanning (scanner.is_scanning ());
+        ui.scanning = scanner.is_scanning ();
     }
 
     private void scan_cb (UserInterface ui, string? device, ScanOptions options)
@@ -320,7 +320,7 @@ public class SimpleScan : Gtk.Application
         else
             extension = "pdf";
         var filename = "%s.%s".printf (filename_prefix, extension);
-        ui.set_default_file_name (filename);
+        ui.default_file_name = filename;
         scanner.scan (device, options);
     }
 
@@ -379,7 +379,7 @@ public class SimpleScan : Gtk.Application
         }
         else
         {
-            for (var i = 0; i < book.get_n_pages (); i++)
+            for (var i = 0; i < book.n_pages; i++)
             {
                 var path = get_temporary_filename ("scan", "jpg");
                 if (path == null)
diff --git a/src/ui.c b/src/ui.c
index 4c0d0b5..6f6df74 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.20.1, the Vala compiler
+/* ui.c generated by valac 0.22.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -19,9 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
+#include <cairo.h>
 #include <float.h>
 #include <math.h>
-#include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 #include <glib/gstdio.h>
@@ -95,6 +95,7 @@ typedef struct _PageClass PageClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
 #define _autosave_manager_unref0(var) ((var == NULL) ? NULL : (var = (autosave_manager_unref (var), NULL)))
+#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
 
 #define TYPE_SCAN_DEVICE (scan_device_get_type ())
 #define SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_DEVICE, ScanDevice))
@@ -107,7 +108,6 @@ typedef struct _ScanDevice ScanDevice;
 typedef struct _ScanDeviceClass ScanDeviceClass;
 typedef struct _ScanDevicePrivate ScanDevicePrivate;
 #define _scan_device_unref0(var) ((var == NULL) ? NULL : (var = (scan_device_unref (var), NULL)))
-#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_SCAN_TYPE (scan_type_get_type ())
@@ -126,6 +126,7 @@ typedef struct _ScanOptionsClass ScanOptionsClass;
 typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
 #define _scan_options_unref0(var) ((var == NULL) ? NULL : (var = (scan_options_unref (var), NULL)))
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
+#define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
 typedef struct _ParamSpecUserInterface ParamSpecUserInterface;
 typedef struct _ProgressBarDialogPrivate ProgressBarDialogPrivate;
 
@@ -150,8 +151,10 @@ typedef enum  {
 struct _UserInterfacePrivate {
 	GSettings* settings;
 	GtkBuilder* builder;
-	GtkWindow* window;
-	GtkVBox* main_vbox;
+	GtkApplicationWindow* window;
+	GMenuModel* app_menu;
+	GtkMenuBar* menubar;
+	GtkBox* main_vbox;
 	GtkInfoBar* info_bar;
 	GtkImage* info_bar_image;
 	GtkLabel* info_bar_label;
@@ -200,7 +203,7 @@ struct _UserInterfacePrivate {
 	gchar* error_title;
 	gchar* error_text;
 	gboolean error_change_scanner_hint;
-	Book* book;
+	Book* _book;
 	gchar* book_uri;
 	AutosaveManager* autosave_manager;
 	BookView* book_view;
@@ -210,11 +213,12 @@ struct _UserInterfacePrivate {
 	gint default_page_dpi;
 	ScanDirection default_page_scan_direction;
 	gchar* document_hint;
-	gchar* default_file_name;
-	gboolean scanning;
+	gchar* _default_file_name;
+	gboolean scanning_;
 	gint window_width;
 	gint window_height;
 	gboolean window_is_maximized;
+	guint save_state_timeout;
 };
 
 struct _ScanDevice {
@@ -312,6 +316,7 @@ GType scan_direction_get_type (void) G_GNUC_CONST;
 enum  {
 	USER_INTERFACE_DUMMY_PROPERTY
 };
+Book* user_interface_get_book (UserInterface* self);
 gpointer page_ref (gpointer instance);
 void page_unref (gpointer instance);
 GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -325,17 +330,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self);
 #define USER_INTERFACE_DEFAULT_TEXT_DPI 150
 #define USER_INTERFACE_DEFAULT_PHOTO_DPI 300
+void user_interface_new_document_activate_cb (UserInterface* self);
+static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_save_document_activate_cb (UserInterface* self);
+static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_save_as_document_activate_cb (UserInterface* self);
+static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_email_document_activate_cb (UserInterface* self);
+static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_print_document_activate_cb (UserInterface* self);
+static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_preferences_activate_cb (UserInterface* self);
+static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_help_contents_activate_cb (UserInterface* self);
+static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_about_activate_cb (UserInterface* self);
+static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_quit_activate_cb (UserInterface* self);
+static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 UserInterface* user_interface_new (void);
 UserInterface* user_interface_construct (GType object_type);
 Book* book_new (void);
 Book* book_construct (GType object_type);
+static void user_interface_set_book (UserInterface* self, Book* value);
 static void user_interface_load (UserInterface* self);
-AutosaveManager* autosave_manager_create (Book** book);
+AutosaveManager* autosave_manager_new (void);
+AutosaveManager* autosave_manager_construct (GType object_type);
+void autosave_manager_set_book (AutosaveManager* self, Book* value);
+void autosave_manager_load (AutosaveManager* self);
+guint book_get_n_pages (Book* self);
+static void user_interface_add_default_page (UserInterface* self);
+void book_set_needs_saving (Book* self, gboolean value);
+Page* book_get_page (Book* self, gint page_number);
+void book_view_set_selected_page (BookView* self, Page* value);
+static void user_interface_needs_saving_cb (UserInterface* self, Book* book);
+static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self);
 static gboolean user_interface_find_scan_device (UserInterface* self, const gchar* device, GtkTreeIter* iter);
 static void user_interface_show_error_dialog (UserInterface* self, const gchar* error_title, const gchar* error_text);
-void user_interface_set_default_file_name (UserInterface* self, const gchar* default_file_name);
 void user_interface_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password);
 void G_MODULE_EXPORT device_combo_changed_cb (GtkWidget* widget, UserInterface* self);
+gchar* user_interface_get_selected_device (UserInterface* self);
 static void user_interface_update_info_bar (UserInterface* self);
 gpointer scan_device_ref (gpointer instance);
 void scan_device_unref (gpointer instance);
@@ -345,42 +379,37 @@ void value_take_scan_device (GValue* value, gpointer v_object);
 gpointer value_get_scan_device (const GValue* value);
 GType scan_device_get_type (void) G_GNUC_CONST;
 void user_interface_set_scan_devices (UserInterface* self, GList* devices);
-static gchar* user_interface_get_selected_device (UserInterface* self);
-void user_interface_set_selected_device (UserInterface* self, const gchar* device);
-static void user_interface_add_default_page (UserInterface* self);
-Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction);
-void book_view_select_page (BookView* self, Page* page);
+Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
+Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
+void book_append_page (Book* self, Page* page);
 static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSelection* selection);
 static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTreeSelection* selection);
 static gchar* user_interface_choose_file_location (UserInterface* self);
+const gchar* user_interface_get_default_file_name (UserInterface* self);
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self);
 static gboolean user_interface_save_document (UserInterface* self, gboolean force_choose_location);
 void user_interface_show_progress_dialog (UserInterface* self);
 void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
-static gint user_interface_get_quality (UserInterface* self);
+gint user_interface_get_quality (UserInterface* self);
 void user_interface_hide_progress_dialog (UserInterface* self);
 void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint);
-void book_set_needs_saving (Book* self, gboolean needs_saving);
 static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* title, const gchar* discard_label);
 gboolean book_get_needs_saving (Book* self);
 static void user_interface_clear_document (UserInterface* self);
 void book_clear (Book* self);
+static void user_interface_new_document (UserInterface* self);
+gboolean user_interface_get_scanning (UserInterface* self);
 void G_MODULE_EXPORT new_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint);
+static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint, gboolean save);
 void G_MODULE_EXPORT text_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
 void G_MODULE_EXPORT photo_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
 GType scan_type_get_type (void) G_GNUC_CONST;
 static void user_interface_set_page_side (UserInterface* self, ScanType page_side);
 static void user_interface_set_paper_size (UserInterface* self, gint width, gint height);
-static void user_interface_set_brightness (UserInterface* self, gint brightness);
-static void user_interface_set_contrast (UserInterface* self, gint contrast);
-static void user_interface_set_quality (UserInterface* self, gint quality);
 static gint user_interface_get_text_dpi (UserInterface* self);
 static gint user_interface_get_photo_dpi (UserInterface* self);
 static ScanType user_interface_get_page_side (UserInterface* self);
 static gboolean user_interface_get_paper_size (UserInterface* self, gint* width, gint* height);
-static gint user_interface_get_brightness (UserInterface* self);
-static gint user_interface_get_contrast (UserInterface* self);
 gpointer scan_options_ref (gpointer instance);
 void scan_options_unref (gpointer instance);
 GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -388,10 +417,12 @@ void value_set_scan_options (GValue* value, gpointer v_object);
 void value_take_scan_options (GValue* value, gpointer v_object);
 gpointer value_get_scan_options (const GValue* value);
 GType scan_options_get_type (void) G_GNUC_CONST;
-static ScanOptions* user_interface_get_scan_options (UserInterface* self);
+static ScanOptions* user_interface_make_scan_options (UserInterface* self);
 ScanOptions* scan_options_new (void);
 ScanOptions* scan_options_construct (GType object_type);
 GType scan_mode_get_type (void) G_GNUC_CONST;
+gint user_interface_get_brightness (UserInterface* self);
+gint user_interface_get_contrast (UserInterface* self);
 void G_MODULE_EXPORT scan_button_clicked_cb (GtkWidget* widget, UserInterface* self);
 void G_MODULE_EXPORT stop_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self);
 void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self);
@@ -399,12 +430,11 @@ void G_MODULE_EXPORT preferences_button_clicked_cb (GtkWidget* widget, UserInter
 gboolean G_MODULE_EXPORT preferences_dialog_delete_event_cb (GtkWidget* widget, UserInterface* self);
 void G_MODULE_EXPORT preferences_dialog_response_cb (GtkWidget* widget, gint response_id, UserInterface* self);
 static void user_interface_update_page_menu (UserInterface* self);
-Page* book_view_get_selected (BookView* self);
+Page* book_view_get_selected_page (BookView* self);
 guint book_get_page_index (Book* self, Page* page);
-guint book_get_n_pages (Book* self);
 static void user_interface_page_selected_cb (UserInterface* self, BookView* view, Page* page);
-gboolean page_has_crop (Page* self);
-gchar* page_get_named_crop (Page* self);
+gboolean page_get_has_crop (Page* self);
+const gchar* page_get_crop_name (Page* self);
 static void user_interface_show_page_cb (UserInterface* self, BookView* view, Page* page);
 gchar* get_temporary_filename (const gchar* prefix, const gchar* extension);
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
@@ -442,16 +472,19 @@ void G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb (GtkWidget* widget, Use
 void page_copy_to_clipboard (Page* self, GtkWindow* window);
 void G_MODULE_EXPORT save_as_file_button_clicked_cb (GtkWidget* widget, UserInterface* self);
 static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* operation, GtkPrintContext* print_context, gint page_number);
-Page* book_get_page (Book* self, gint page_number);
-gboolean page_is_landscape (Page* self);
+gboolean page_get_is_landscape (Page* self);
 gint page_get_dpi (Page* self);
 GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
 void G_MODULE_EXPORT email_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_print_document (UserInterface* self);
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self);
+void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_show_help (UserInterface* self);
 void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_show_about (UserInterface* self);
 void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
 static gboolean user_interface_on_quit (UserInterface* self);
+static void user_interface_save_state (UserInterface* self, gboolean force);
 void autosave_manager_cleanup (AutosaveManager* self);
 void G_MODULE_EXPORT quit_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
 gboolean G_MODULE_EXPORT simple_scan_window_configure_event_cb (GtkWidget* widget, GdkEventConfigure* event, UserInterface* self);
@@ -464,27 +497,51 @@ ScanDirection page_get_scan_direction (Page* self);
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self);
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self);
 static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi);
-static void user_interface_needs_saving_cb (UserInterface* self, Book* book);
+static gboolean user_interface_has_app_menu (UserInterface* self, GtkApplication* app);
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self);
+static void __lambda4_ (UserInterface* self);
+static void ___lambda4__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda5_ (UserInterface* self);
+static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda6_ (UserInterface* self);
+static void ___lambda6__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda7_ (UserInterface* self);
+static void ___lambda7__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+void user_interface_set_brightness (UserInterface* self, gint value);
+static void __lambda8_ (UserInterface* self);
+static void ___lambda8__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_contrast (UserInterface* self, gint value);
+static void __lambda9_ (UserInterface* self);
+static void ___lambda9__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_quality (UserInterface* self, gint value);
+static void __lambda10_ (UserInterface* self);
+static void ___lambda10__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 BookView* book_view_new (Book* book);
 BookView* book_view_construct (GType object_type, Book* book);
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self);
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self);
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self);
-static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self);
-ProgressBarDialog* progress_bar_dialog_new (GtkWindow* parent, const gchar* title);
-ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkWindow* parent, const gchar* title);
+static void user_interface_load_state (UserInterface* self);
+ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title);
+ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicationWindow* parent, const gchar* title);
 static void user_interface_book_saving_cb (UserInterface* self, gint page_number);
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self);
+static gchar* user_interface_get_state_filename (UserInterface* self);
+static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_);
+static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_);
+static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_);
 static gboolean ___lambda3_ (UserInterface* self);
 static gboolean ____lambda3__gsource_func (gpointer self);
+static gboolean ___lambda11_ (UserInterface* self);
+static gboolean ____lambda11__gsource_func (gpointer self);
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble percent);
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* message);
-Book* user_interface_get_book (UserInterface* self);
-void user_interface_set_selected_page (UserInterface* self, Page* page);
-Page* user_interface_get_selected_page (UserInterface* self);
-void user_interface_set_scanning (UserInterface* self, gboolean scanning);
 void user_interface_start (UserInterface* self);
+Page* user_interface_get_selected_page (UserInterface* self);
+void user_interface_set_selected_page (UserInterface* self, Page* value);
+void user_interface_set_default_file_name (UserInterface* self, const gchar* value);
+void user_interface_set_scanning (UserInterface* self, gboolean value);
+void user_interface_set_selected_device (UserInterface* self, const gchar* value);
 static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void user_interface_finalize (UserInterface* obj);
@@ -496,352 +553,501 @@ static void progress_bar_dialog_finalize (GObject* 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 const GActionEntry USER_INTERFACE_action_entries[9] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_removed_cb (self, _sender, page);
-#line 504 "ui.c"
+#line 562 "ui.c"
 }
 
 
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb (self, _sender, page);
-#line 511 "ui.c"
+#line 569 "ui.c"
+}
+
+
+static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_new_document_activate_cb (self);
+#line 576 "ui.c"
+}
+
+
+static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_document_activate_cb (self);
+#line 583 "ui.c"
+}
+
+
+static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_as_document_activate_cb (self);
+#line 590 "ui.c"
+}
+
+
+static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_email_document_activate_cb (self);
+#line 597 "ui.c"
+}
+
+
+static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_print_document_activate_cb (self);
+#line 604 "ui.c"
+}
+
+
+static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_preferences_activate_cb (self);
+#line 611 "ui.c"
+}
+
+
+static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_help_contents_activate_cb (self);
+#line 618 "ui.c"
+}
+
+
+static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_about_activate_cb (self);
+#line 625 "ui.c"
+}
+
+
+static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_quit_activate_cb (self);
+#line 632 "ui.c"
+}
+
+
+static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_needs_saving_cb (self, _sender);
+#line 639 "ui.c"
 }
 
 
 UserInterface* user_interface_construct (GType object_type) {
 	UserInterface* self = NULL;
-	GSettings* _tmp0_;
-	Book* _tmp1_;
-	Book* _tmp2_;
-	Book* _tmp3_;
-	AutosaveManager* _tmp4_ = NULL;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GSettings* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
+	Book* _tmp2_ = NULL;
+	Book* _tmp3_ = NULL;
+	Book* _tmp4_ = NULL;
+	AutosaveManager* _tmp5_ = NULL;
+	AutosaveManager* _tmp6_ = NULL;
+	Book* _tmp7_ = NULL;
+	AutosaveManager* _tmp8_ = NULL;
+	Book* _tmp9_ = NULL;
+	guint _tmp10_ = 0U;
+	guint _tmp11_ = 0U;
+	Book* _tmp17_ = NULL;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (UserInterface*) g_type_create_instance (object_type);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->settings = _tmp0_;
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_new ();
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (self->priv->book);
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book = _tmp1_;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->book;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp2_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->book;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self);
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_book (self, _tmp2_);
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_book_unref0 (_tmp2_);
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->_book;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp3_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->_book;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp4_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load (self);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = autosave_manager_create (&self->priv->book);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = autosave_manager_new ();
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->autosave_manager = _tmp4_;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->autosave_manager = _tmp5_;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = self->priv->autosave_manager;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = self->priv->_book;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_set_book (_tmp6_, _tmp7_);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = self->priv->autosave_manager;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_load (_tmp8_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = self->priv->_book;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = book_get_n_pages (_tmp9_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = _tmp10_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp11_ == ((guint) 0)) {
+#line 708 "ui.c"
+		Book* _tmp12_ = NULL;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_add_default_page (self);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = self->priv->_book;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_set_needs_saving (_tmp12_, FALSE);
+#line 716 "ui.c"
+	} else {
+		BookView* _tmp13_ = NULL;
+		Book* _tmp14_ = NULL;
+		Page* _tmp15_ = NULL;
+		Page* _tmp16_ = NULL;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = self->priv->book_view;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = self->priv->_book;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = book_get_page (_tmp14_, 0);
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = _tmp15_;
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_view_set_selected_page (_tmp13_, _tmp16_);
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_page_unref0 (_tmp16_);
+#line 734 "ui.c"
+	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = self->priv->_book;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp17_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 554 "ui.c"
+#line 742 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 561 "ui.c"
+#line 749 "ui.c"
 }
 
 
 static gboolean user_interface_find_scan_device (UserInterface* self, const gchar* device, GtkTreeIter* iter) {
 	GtkTreeIter _vala_iter = {0};
 	gboolean result = FALSE;
-	gboolean have_iter;
-	GtkListStore* _tmp0_;
+	gboolean have_iter = FALSE;
+	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (device != NULL, FALSE);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_iter = FALSE;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_model;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_iter = _tmp1_;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 586 "ui.c"
+#line 774 "ui.c"
 		{
-			gboolean _tmp3_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gboolean _tmp3_ = FALSE;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 593 "ui.c"
-				gboolean _tmp4_;
+#line 781 "ui.c"
+				gboolean _tmp4_ = FALSE;
 				gchar* d = NULL;
-				GtkListStore* _tmp10_;
-				GtkTreeIter _tmp11_;
-				const gchar* _tmp12_;
-				const gchar* _tmp13_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				GtkListStore* _tmp10_ = NULL;
+				GtkTreeIter _tmp11_ = {0};
+				const gchar* _tmp12_ = NULL;
+				const gchar* _tmp13_ = NULL;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = _tmp3_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp4_) {
-#line 604 "ui.c"
+#line 792 "ui.c"
 					gboolean _tmp5_ = FALSE;
-					gboolean _tmp6_;
-					gboolean _tmp9_;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gboolean _tmp6_ = FALSE;
+					gboolean _tmp9_ = FALSE;
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp6_ = have_iter;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp6_) {
-#line 612 "ui.c"
-						GtkListStore* _tmp7_;
+#line 800 "ui.c"
+						GtkListStore* _tmp7_ = NULL;
 						gboolean _tmp8_ = FALSE;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp7_ = self->priv->device_model;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp8_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp7_, &_vala_iter);
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp5_ = _tmp8_;
-#line 621 "ui.c"
+#line 809 "ui.c"
 					} else {
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp5_ = FALSE;
-#line 625 "ui.c"
+#line 813 "ui.c"
 					}
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp9_ = _tmp5_;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp9_) {
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 633 "ui.c"
+#line 821 "ui.c"
 					}
 				}
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = self->priv->device_model;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = _vala_iter;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp10_, &_tmp11_, 0, &d, -1, -1);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = d;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = device;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp12_, _tmp13_) == 0) {
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
-#line 652 "ui.c"
+#line 840 "ui.c"
 				}
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 656 "ui.c"
+#line 844 "ui.c"
 			}
 		}
 	}
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = have_iter;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (iter) {
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 666 "ui.c"
+#line 854 "ui.c"
 	}
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 670 "ui.c"
+#line 858 "ui.c"
 }
 
 
 static void user_interface_show_error_dialog (UserInterface* self, const gchar* error_title, const gchar* error_text) {
-	GtkWindow* _tmp0_;
-	const gchar* _tmp1_;
-	GtkMessageDialog* _tmp2_;
-	GtkMessageDialog* dialog;
-	const gchar* _tmp3_;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkMessageDialog* dialog = NULL;
+	GtkApplicationWindow* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	GtkMessageDialog* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = error_title;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp1_);
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp2_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) dialog, GTK_STOCK_CLOSE, 0);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = error_text;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _ ("_Close");
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp3_, 0);
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = error_text;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp4_);
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) dialog);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 706 "ui.c"
-}
-
-
-void user_interface_set_default_file_name (UserInterface* self, const gchar* default_file_name) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (default_file_name != NULL);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = default_file_name;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->default_file_name);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_file_name = _tmp1_;
-#line 725 "ui.c"
+#line 897 "ui.c"
 }
 
 
 void user_interface_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password) {
 	gchar* _vala_username = NULL;
 	gchar* _vala_password = NULL;
+	gchar* description = NULL;
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_;
+	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gchar* description;
-	GtkEntry* _tmp3_;
-	GtkEntry* _tmp4_;
-	GtkLabel* _tmp5_;
-	GtkDialog* _tmp6_;
-	GtkDialog* _tmp7_;
-	GtkDialog* _tmp8_;
-	GtkEntry* _tmp9_;
+	GtkEntry* _tmp3_ = NULL;
+	GtkEntry* _tmp4_ = NULL;
+	GtkLabel* _tmp5_ = NULL;
+	GtkDialog* _tmp6_ = NULL;
+	GtkDialog* _tmp7_ = NULL;
+	GtkDialog* _tmp8_ = NULL;
+	GtkEntry* _tmp9_ = NULL;
 	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_;
-	GtkEntry* _tmp12_;
+	gchar* _tmp11_ = NULL;
+	GtkEntry* _tmp12_ = NULL;
 	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gchar* _tmp14_ = NULL;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (resource != NULL);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Username and password required to access '%s'");
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = resource;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp2_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->username_entry;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp3_, "");
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp4_, "");
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->authorize_label;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp5_, description);
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->authorize_dialog;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp6_);
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->authorize_dialog;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp7_);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->authorize_dialog;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp8_);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->username_entry;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_username);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_username = _tmp11_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->password_entry;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = gtk_entry_get_text (_tmp12_);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_strdup (_tmp13_);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_password);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_password = _tmp14_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (username) {
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 810 "ui.c"
+#line 982 "ui.c"
 	} else {
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 814 "ui.c"
+#line 986 "ui.c"
 	}
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
-#line 820 "ui.c"
+#line 992 "ui.c"
 	} else {
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 824 "ui.c"
+#line 996 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT device_combo_changed_cb (GtkWidget* widget, UserInterface* self) {
-	gboolean _tmp0_;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp0_ = FALSE;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->setting_devices;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 841 "ui.c"
+#line 1017 "ui.c"
 	}
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 845 "ui.c"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_selected_device (self);
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _tmp3_ != NULL;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp3_);
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 1033 "ui.c"
+		GSettings* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = self->priv->settings;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = user_interface_get_selected_device (self);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = _tmp6_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = _tmp7_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp8_);
+#line 1050 "ui.c"
+	}
 }
 
 
@@ -850,904 +1056,831 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	gchar* title = NULL;
 	gchar* text = NULL;
 	gchar* image_id = NULL;
-	gboolean show_close_button;
-	gboolean show_change_scanner_button;
-	gboolean _tmp0_;
-	GtkInfoBar* _tmp15_;
-	GtkMessageType _tmp16_;
-	GtkImage* _tmp17_;
-	const gchar* _tmp18_;
-	const gchar* _tmp19_;
-	const gchar* _tmp20_;
+	gboolean show_close_button = FALSE;
+	gboolean show_change_scanner_button = FALSE;
+	gboolean _tmp0_ = FALSE;
+	GtkInfoBar* _tmp15_ = NULL;
+	GtkMessageType _tmp16_ = 0;
+	GtkImage* _tmp17_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	gchar* message = NULL;
+	const gchar* _tmp19_ = NULL;
+	const gchar* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
-	gchar* message;
-	GtkLabel* _tmp22_;
-	const gchar* _tmp23_;
-	GtkButton* _tmp24_;
-	gboolean _tmp25_;
-	GtkButton* _tmp26_;
-	gboolean _tmp27_;
-	GtkInfoBar* _tmp28_;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkLabel* _tmp22_ = NULL;
+	const gchar* _tmp23_ = NULL;
+	GtkButton* _tmp24_ = NULL;
+	gboolean _tmp25_ = FALSE;
+	GtkButton* _tmp26_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	GtkInfoBar* _tmp28_ = NULL;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_close_button = FALSE;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_change_scanner_button = FALSE;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->have_error;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 882 "ui.c"
-		gchar* _tmp1_;
-		const gchar* _tmp2_;
-		gchar* _tmp3_;
-		const gchar* _tmp4_;
-		gchar* _tmp5_;
-		gboolean _tmp6_;
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1088 "ui.c"
+		gchar* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		gboolean _tmp6_ = FALSE;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		type = GTK_MESSAGE_ERROR;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = g_strdup (GTK_STOCK_DIALOG_ERROR);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = g_strdup ("dialog-error");
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (image_id);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		image_id = _tmp1_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->error_title;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (title);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		title = _tmp3_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->error_text;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (text);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		text = _tmp5_;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_close_button = TRUE;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->error_change_scanner_hint;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 919 "ui.c"
+#line 1125 "ui.c"
 	} else {
-		GtkListStore* _tmp7_;
+		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->device_model;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
-#line 929 "ui.c"
-			gchar* _tmp9_;
+#line 1135 "ui.c"
+			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_;
+			gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
-			gchar* _tmp13_;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gchar* _tmp13_ = NULL;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			type = GTK_MESSAGE_WARNING;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp9_ = g_strdup (GTK_STOCK_DIALOG_WARNING);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp9_ = g_strdup ("dialog-warning");
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			image_id = _tmp9_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _ ("No scanners detected");
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			title = _tmp11_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = _ ("Please check your scanner is connected and powered on");
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = g_strdup (_tmp12_);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			text = _tmp13_;
-#line 959 "ui.c"
+#line 1165 "ui.c"
 		} else {
-			GtkInfoBar* _tmp14_;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			GtkInfoBar* _tmp14_ = NULL;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = self->priv->info_bar;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_widget_hide ((GtkWidget*) _tmp14_);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
-#line 974 "ui.c"
+#line 1180 "ui.c"
 		}
 	}
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->info_bar;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = type;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_info_bar_set_message_type (_tmp15_, _tmp16_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->info_bar_image;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = image_id;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_image_set_from_stock (_tmp17_, _tmp18_, GTK_ICON_SIZE_DIALOG);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_image_set_from_icon_name (_tmp17_, _tmp18_, GTK_ICON_SIZE_DIALOG);
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = title;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = text;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp19_, _tmp20_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp21_;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->info_bar_label;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = message;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_markup (_tmp22_, _tmp23_);
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = self->priv->info_bar_close_button;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = show_close_button;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp24_, _tmp25_);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = self->priv->info_bar_change_scanner_button;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = show_change_scanner_button;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp26_, _tmp27_);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = self->priv->info_bar;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp28_);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (image_id);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (text);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1027 "ui.c"
+#line 1233 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 1034 "ui.c"
+#line 1240 "ui.c"
 }
 
 
 void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
-	gboolean have_selection;
+	gboolean have_selection = FALSE;
 	gint index = 0;
 	GtkTreeIter iter = {0};
-	gboolean _tmp0_;
-	GList* _tmp3_;
+	gboolean _tmp0_ = FALSE;
+	GList* _tmp3_ = NULL;
 	gboolean _tmp52_ = FALSE;
-	gboolean _tmp53_;
-	gboolean _tmp55_;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp53_ = FALSE;
+	gboolean _tmp55_ = FALSE;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_selection = FALSE;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = TRUE;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->user_selected_device;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1057 "ui.c"
-		GtkComboBox* _tmp1_;
+#line 1263 "ui.c"
+		GtkComboBox* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp2_ >= 0;
-#line 1066 "ui.c"
+#line 1272 "ui.c"
 	}
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = devices;
-#line 1072 "ui.c"
+#line 1278 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		device_collection = _tmp3_;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1080 "ui.c"
-			ScanDevice* _tmp4_;
+#line 1286 "ui.c"
+			ScanDevice* _tmp4_ = NULL;
 			ScanDevice* device = NULL;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp4_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			device = _tmp4_;
-#line 1087 "ui.c"
+#line 1293 "ui.c"
 			{
-				gint n_delete;
-				GtkListStore* _tmp5_;
-				gint _tmp6_;
+				gint n_delete = 0;
+				GtkListStore* _tmp5_ = NULL;
+				gint _tmp6_ = 0;
 				GtkTreeIter _tmp7_ = {0};
 				gboolean _tmp8_ = FALSE;
-				gint _tmp21_;
-				gint _tmp45_;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gint _tmp21_ = 0;
+				gint _tmp45_ = 0;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				n_delete = -1;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = self->priv->device_model;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = index;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp5_, &_tmp7_, NULL, _tmp6_);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp7_;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_) {
-#line 1108 "ui.c"
-					gint i;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1314 "ui.c"
+					gint i = 0;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1112 "ui.c"
+#line 1318 "ui.c"
 					{
-						gboolean _tmp9_;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gboolean _tmp9_ = FALSE;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp9_ = TRUE;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1119 "ui.c"
-							gboolean _tmp10_;
+#line 1325 "ui.c"
+							gboolean _tmp10_ = FALSE;
 							gchar* name = NULL;
 							gboolean matched = FALSE;
-							GtkListStore* _tmp13_;
-							GtkTreeIter _tmp14_;
-							const gchar* _tmp15_;
-							ScanDevice* _tmp16_;
-							const gchar* _tmp17_;
-							gboolean _tmp18_;
-							gint _tmp20_;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							GtkListStore* _tmp13_ = NULL;
+							GtkTreeIter _tmp14_ = {0};
+							const gchar* _tmp15_ = NULL;
+							ScanDevice* _tmp16_ = NULL;
+							const gchar* _tmp17_ = NULL;
+							gboolean _tmp18_ = FALSE;
+							gint _tmp20_ = 0;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp10_ = _tmp9_;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp10_) {
-#line 1134 "ui.c"
-								GtkListStore* _tmp11_;
+#line 1340 "ui.c"
+								GtkListStore* _tmp11_ = NULL;
 								gboolean _tmp12_ = FALSE;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp11_ = self->priv->device_model;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp12_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp11_, &iter);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (!_tmp12_) {
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1145 "ui.c"
+#line 1351 "ui.c"
 								}
 							}
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp9_ = FALSE;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp13_ = self->priv->device_model;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp14_ = iter;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_get ((GtkTreeModel*) _tmp13_, &_tmp14_, 0, &name, -1, -1);
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp15_ = name;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp16_ = device;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp17_ = _tmp16_->name;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							matched = g_strcmp0 (_tmp15_, _tmp17_) == 0;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp18_ = matched;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp18_) {
-#line 1168 "ui.c"
-								gint _tmp19_;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "ui.c"
+								gint _tmp19_ = 0;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp19_ = i;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								n_delete = _tmp19_;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1178 "ui.c"
+#line 1384 "ui.c"
 							}
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = i;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							i = _tmp20_ + 1;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1186 "ui.c"
+#line 1392 "ui.c"
 						}
 					}
 				}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = n_delete;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ >= 0) {
-#line 1194 "ui.c"
+#line 1400 "ui.c"
 					gint i = 0;
-					GtkListStore* _tmp22_;
-					GtkTreeIter _tmp23_;
-					ScanDevice* _tmp24_;
-					const gchar* _tmp25_;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					GtkListStore* _tmp22_ = NULL;
+					GtkTreeIter _tmp23_ = {0};
+					ScanDevice* _tmp24_ = NULL;
+					const gchar* _tmp25_ = NULL;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = self->priv->device_model;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = iter;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = device;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = _tmp24_->label;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp22_, &_tmp23_, 1, _tmp25_, -1, -1);
-#line 1210 "ui.c"
+#line 1416 "ui.c"
 					{
-						gboolean _tmp26_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gboolean _tmp26_ = FALSE;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						i = 0;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp26_ = TRUE;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1219 "ui.c"
-							gboolean _tmp27_;
-							gint _tmp29_;
-							gint _tmp30_;
-							GtkListStore* _tmp31_;
-							gint _tmp32_;
+#line 1425 "ui.c"
+							gboolean _tmp27_ = FALSE;
+							gint _tmp29_ = 0;
+							gint _tmp30_ = 0;
+							GtkListStore* _tmp31_ = NULL;
+							gint _tmp32_ = 0;
 							GtkTreeIter _tmp33_ = {0};
-							GtkListStore* _tmp34_;
-							GtkTreeIter _tmp35_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							GtkListStore* _tmp34_ = NULL;
+							GtkTreeIter _tmp35_ = {0};
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp27_ = _tmp26_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp27_) {
-#line 1232 "ui.c"
-								gint _tmp28_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1438 "ui.c"
+								gint _tmp28_ = 0;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp28_ = i;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								i = _tmp28_ + 1;
-#line 1238 "ui.c"
+#line 1444 "ui.c"
 							}
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = FALSE;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp29_ = i;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp30_ = n_delete;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!(_tmp29_ < _tmp30_)) {
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1250 "ui.c"
+#line 1456 "ui.c"
 							}
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp31_ = self->priv->device_model;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp32_ = index;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp31_, &_tmp33_, NULL, _tmp32_);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							iter = _tmp33_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp34_ = self->priv->device_model;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp35_ = iter;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp34_, &_tmp35_);
-#line 1266 "ui.c"
+#line 1472 "ui.c"
 						}
 					}
 				} else {
-					GtkListStore* _tmp36_;
-					gint _tmp37_;
+					GtkListStore* _tmp36_ = NULL;
+					gint _tmp37_ = 0;
 					GtkTreeIter _tmp38_ = {0};
-					GtkListStore* _tmp39_;
-					GtkTreeIter _tmp40_;
-					ScanDevice* _tmp41_;
-					const gchar* _tmp42_;
-					ScanDevice* _tmp43_;
-					const gchar* _tmp44_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					GtkListStore* _tmp39_ = NULL;
+					GtkTreeIter _tmp40_ = {0};
+					ScanDevice* _tmp41_ = NULL;
+					const gchar* _tmp42_ = NULL;
+					ScanDevice* _tmp43_ = NULL;
+					const gchar* _tmp44_ = NULL;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = self->priv->device_model;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp37_ = index;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_insert (_tmp36_, &_tmp38_, _tmp37_);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					iter = _tmp38_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp39_ = self->priv->device_model;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp40_ = iter;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp41_ = device;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp42_ = _tmp41_->name;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp43_ = device;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp44_ = _tmp43_->label;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp39_, &_tmp40_, 0, _tmp42_, 1, _tmp44_, -1, -1);
-#line 1301 "ui.c"
+#line 1507 "ui.c"
 				}
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = index;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				index = _tmp45_ + 1;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1309 "ui.c"
+#line 1515 "ui.c"
 			}
 		}
 	}
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1315 "ui.c"
-		GtkListStore* _tmp46_;
-		gint _tmp47_;
+#line 1521 "ui.c"
+		GtkListStore* _tmp46_ = NULL;
+		gint _tmp47_ = 0;
 		GtkTreeIter _tmp48_ = {0};
 		gboolean _tmp49_ = FALSE;
-		GtkListStore* _tmp50_;
-		GtkTreeIter _tmp51_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkListStore* _tmp50_ = NULL;
+		GtkTreeIter _tmp51_ = {0};
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = self->priv->device_model;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = index;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp46_, &_tmp48_, NULL, _tmp47_);
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp48_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp49_) {
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1334 "ui.c"
+#line 1540 "ui.c"
 		}
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = self->priv->device_model;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = iter;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp50_, &_tmp51_);
-#line 1342 "ui.c"
+#line 1548 "ui.c"
 	}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = have_selection;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp53_) {
-#line 1348 "ui.c"
-		GList* _tmp54_;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1554 "ui.c"
+		GList* _tmp54_ = NULL;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = devices;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = _tmp54_ != NULL;
-#line 1354 "ui.c"
+#line 1560 "ui.c"
 	} else {
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = FALSE;
-#line 1358 "ui.c"
+#line 1564 "ui.c"
 	}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = _tmp52_;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp55_) {
-#line 1364 "ui.c"
-		GtkComboBox* _tmp56_;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "ui.c"
+		GtkComboBox* _tmp56_ = NULL;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = self->priv->device_combo;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active (_tmp56_, 0);
-#line 1370 "ui.c"
+#line 1576 "ui.c"
 	}
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1376 "ui.c"
-}
-
-
-static gchar* user_interface_get_selected_device (UserInterface* self) {
-	gchar* result = NULL;
-	GtkTreeIter iter = {0};
-	GtkComboBox* _tmp0_;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->device_combo;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 1396 "ui.c"
-		gchar* device = NULL;
-		GtkListStore* _tmp3_;
-		GtkTreeIter _tmp4_;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->device_model;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = iter;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = device;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return result;
-#line 1410 "ui.c"
-	}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = NULL;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 1416 "ui.c"
-}
-
-
-void user_interface_set_selected_device (UserInterface* self, const gchar* device) {
-	GtkTreeIter iter = {0};
-	const gchar* _tmp0_;
-	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	GtkComboBox* _tmp3_;
-	GtkTreeIter _tmp4_;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (device != NULL);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = device;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp1_;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 1441 "ui.c"
-	}
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->device_combo;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = iter;
-#line 315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->user_selected_device = TRUE;
-#line 1451 "ui.c"
+#line 1582 "ui.c"
 }
 
 
 static void user_interface_add_default_page (UserInterface* self) {
-	Book* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	ScanDirection _tmp4_;
-	Page* _tmp5_ = NULL;
-	Page* page;
-	BookView* _tmp6_;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* page = NULL;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	ScanDirection _tmp3_ = 0;
+	Page* _tmp4_ = NULL;
+	Book* _tmp5_ = NULL;
+	BookView* _tmp6_ = NULL;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->default_page_width;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->default_page_height;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->default_page_dpi;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->default_page_scan_direction;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = book_append_page (_tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp5_;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->default_page_width;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = self->priv->default_page_height;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = self->priv->default_page_dpi;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->default_page_scan_direction;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp4_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = self->priv->_book;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_append_page (_tmp5_, page);
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_view_select_page (_tmp6_, page);
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_view_set_selected_page (_tmp6_, page);
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1486 "ui.c"
+#line 1619 "ui.c"
 }
 
 
 static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
-	gint _tmp0_;
-	gunichar _tmp1_;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
-	gchar* _result_;
-	gchar* _tmp3_;
-#line 928 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	gchar* _tmp3_ = NULL;
+#line 928 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1511 "ui.c"
-		gchar* _tmp4_;
-#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1644 "ui.c"
+		gchar* _tmp4_ = NULL;
+#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 1519 "ui.c"
+#line 1652 "ui.c"
 	} else {
-#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = -1;
-#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 1525 "ui.c"
+#line 1658 "ui.c"
 	}
 }
 
 
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
-	gint _tmp0_;
-	gint _tmp1_;
-	glong string_length;
-	glong _tmp2_;
-	glong _tmp5_;
+	glong string_length = 0L;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	glong _tmp2_ = 0L;
+	glong _tmp5_ = 0L;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_;
-	gboolean _tmp12_;
+	glong _tmp9_ = 0L;
+	gboolean _tmp12_ = FALSE;
 	gboolean _tmp13_ = FALSE;
-	glong _tmp14_;
-	gboolean _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	glong _tmp22_;
+	glong _tmp14_ = 0L;
+	gboolean _tmp17_ = FALSE;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	glong _tmp22_ = 0L;
 	gchar* _tmp23_ = NULL;
-#line 1190 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1189 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1561 "ui.c"
-		glong _tmp3_;
-		glong _tmp4_;
-#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1694 "ui.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1570 "ui.c"
+#line 1703 "ui.c"
 	}
-#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1576 "ui.c"
-		glong _tmp6_;
-		glong _tmp7_;
-#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1709 "ui.c"
+		glong _tmp6_ = 0L;
+		glong _tmp7_ = 0L;
+#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1585 "ui.c"
+#line 1718 "ui.c"
 	}
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1591 "ui.c"
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1724 "ui.c"
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1600 "ui.c"
+#line 1733 "ui.c"
 	} else {
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1604 "ui.c"
+#line 1737 "ui.c"
 	}
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp12_ = _tmp8_;
-#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp14_ = end;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp14_ >= ((glong) 0)) {
-#line 1614 "ui.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1747 "ui.c"
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp15_ = end;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp13_ = _tmp15_ <= _tmp16_;
-#line 1623 "ui.c"
+#line 1756 "ui.c"
 	} else {
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp13_ = FALSE;
-#line 1627 "ui.c"
+#line 1760 "ui.c"
 	}
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp17_ = _tmp13_;
-#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp17_, NULL);
-#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp21_ = end;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp22_ = start;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp23_;
-#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 1651 "ui.c"
+#line 1784 "ui.c"
 }
 
 
 static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSelection* selection) {
-	GtkTreeSelection* _tmp0_;
+	gchar* extension = NULL;
+	GtkTreeSelection* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-	gchar* extension;
-	GtkFileChooserDialog* _tmp2_;
+	gchar* path = NULL;
+	GtkFileChooserDialog* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	gchar* path;
-	const gchar* _tmp4_;
+	gchar* filename = NULL;
+	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-	gchar* filename;
-	const gchar* _tmp6_;
+	gint extension_index = 0;
+	const gchar* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-	gint extension_index;
-	gint _tmp8_;
-	const gchar* _tmp12_;
-	const gchar* _tmp13_;
-	gchar* _tmp14_;
-	GtkFileChooserDialog* _tmp15_;
-	const gchar* _tmp16_;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp8_ = 0;
+	const gchar* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	gchar* _tmp14_ = NULL;
+	GtkFileChooserDialog* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (selection != NULL);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = selection;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_extension (self, _tmp0_);
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp1_;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_dialog;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp2_);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp3_;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = path;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp5_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = filename;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = string_last_index_of_char (_tmp6_, (gunichar) '.', 0);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension_index = _tmp7_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = extension_index;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ >= 0) {
-#line 1706 "ui.c"
-		const gchar* _tmp9_;
-		gint _tmp10_;
+#line 1839 "ui.c"
+		const gchar* _tmp9_ = NULL;
+		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = filename;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = extension_index;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = string_slice (_tmp9_, (glong) 0, (glong) _tmp10_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp11_;
-#line 1720 "ui.c"
+#line 1853 "ui.c"
 	}
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = filename;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = extension;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp14_;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 1744 "ui.c"
+#line 1877 "ui.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1751 "ui.c"
+#line 1884 "ui.c"
 }
 
 
@@ -1755,96 +1888,96 @@ static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTre
 	gchar* result = NULL;
 	GtkTreeModel* model = NULL;
 	GtkTreeIter iter = {0};
-	gchar* _tmp0_;
-	gchar* extension;
-	GtkTreeSelection* _tmp1_;
+	gchar* extension = NULL;
+	gchar* _tmp0_ = NULL;
+	GtkTreeSelection* _tmp1_ = NULL;
 	GtkTreeModel* _tmp2_ = NULL;
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
-	GtkTreeModel* _tmp5_;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkTreeModel* _tmp5_ = NULL;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (selection != NULL, NULL);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp0_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = selection;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = gtk_tree_selection_get_selected (_tmp1_, &_tmp2_, &_tmp3_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _g_object_ref0 (_tmp2_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp5_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp3_;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1788 "ui.c"
-		GtkTreeModel* _tmp6_;
-		GtkTreeIter _tmp7_;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "ui.c"
+		GtkTreeModel* _tmp6_ = NULL;
+		GtkTreeIter _tmp7_ = {0};
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = model;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = iter;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &extension, -1, -1);
-#line 1797 "ui.c"
+#line 1930 "ui.c"
 	}
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = extension;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 1805 "ui.c"
+#line 1938 "ui.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
-	gchar* _tmp0_;
-	glong _tmp1_;
+	gchar* end = NULL;
+	gchar* _tmp0_ = NULL;
+	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
-	gchar* end;
-	gchar* _tmp3_;
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	gchar* _tmp3_ = NULL;
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1828 "ui.c"
-		glong _tmp4_;
-#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1961 "ui.c"
+		glong _tmp4_ = 0L;
+#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 1836 "ui.c"
+#line 1969 "ui.c"
 	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 1848 "ui.c"
+#line 1981 "ui.c"
 	}
 }
 
@@ -1853,735 +1986,747 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	gboolean _tmp3_;
-	glong _tmp9_;
-	glong _tmp15_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	glong _tmp22_;
+	glong _tmp1_ = 0L;
+	gboolean _tmp3_ = FALSE;
+	glong _tmp9_ = 0L;
+	glong _tmp15_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	glong _tmp22_ = 0L;
 	gchar* _tmp23_ = NULL;
-#line 1168 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1167 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1873 "ui.c"
-		glong _tmp2_;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2006 "ui.c"
+		glong _tmp2_ = 0L;
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1879 "ui.c"
+#line 2012 "ui.c"
 	} else {
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1883 "ui.c"
+#line 2016 "ui.c"
 	}
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp3_ = _tmp0_;
-#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp3_) {
-#line 1889 "ui.c"
-		glong _tmp4_;
-		glong _tmp5_;
+#line 2022 "ui.c"
+		glong _tmp4_ = 0L;
+		glong _tmp5_ = 0L;
 		glong _tmp6_ = 0L;
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = offset;
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp5_ = len;
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
-#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		string_length = _tmp6_;
-#line 1901 "ui.c"
+#line 2034 "ui.c"
 	} else {
-		gint _tmp7_;
-		gint _tmp8_;
-#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		gint _tmp7_ = 0;
+		gint _tmp8_ = 0;
+#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp7_ = strlen (self);
-#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp7_;
-#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp8_;
-#line 1911 "ui.c"
+#line 2044 "ui.c"
 	}
-#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp9_ = offset;
-#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp9_ < ((glong) 0)) {
-#line 1917 "ui.c"
-		glong _tmp10_;
-		glong _tmp11_;
-		glong _tmp12_;
-#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2050 "ui.c"
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+		glong _tmp12_ = 0L;
+#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp10_ = string_length;
-#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		offset = _tmp10_ + _tmp11_;
-#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
-#line 1931 "ui.c"
+#line 2064 "ui.c"
 	} else {
-		glong _tmp13_;
-		glong _tmp14_;
-#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		glong _tmp13_ = 0L;
+		glong _tmp14_ = 0L;
+#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp13_ = offset;
-#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp14_ = string_length;
-#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
-#line 1941 "ui.c"
+#line 2074 "ui.c"
 	}
-#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp15_ = len;
-#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_tmp15_ < ((glong) 0)) {
-#line 1947 "ui.c"
-		glong _tmp16_;
-		glong _tmp17_;
-#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 2080 "ui.c"
+		glong _tmp16_ = 0L;
+		glong _tmp17_ = 0L;
+#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
-#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp17_ = offset;
-#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		len = _tmp16_ - _tmp17_;
-#line 1956 "ui.c"
+#line 2089 "ui.c"
 	}
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp18_ = offset;
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp19_ = len;
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp20_ = string_length;
-#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp21_ = offset;
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp22_ = len;
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp23_;
-#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 1976 "ui.c"
+#line 2109 "ui.c"
 }
 
 
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_file_type_changed (self, _sender);
-#line 1983 "ui.c"
+#line 2116 "ui.c"
 }
 
 
 static gchar* user_interface_choose_file_location (UserInterface* self) {
 	gchar* result = NULL;
-	gchar* directory;
-	GSettings* _tmp0_;
+	gchar* directory = NULL;
+	GSettings* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_;
-	gboolean _tmp5_;
+	const gchar* _tmp3_ = NULL;
+	gboolean _tmp5_ = FALSE;
 	const gchar* _tmp8_ = NULL;
-	GtkWindow* _tmp9_;
-	GtkFileChooserDialog* _tmp10_;
-	GtkFileChooserDialog* _tmp11_;
-	GtkFileChooserDialog* _tmp12_;
-	GtkFileChooserDialog* _tmp13_;
-	const gchar* _tmp14_;
-	GtkFileChooserDialog* _tmp15_;
-	const gchar* _tmp16_;
-	GtkFileFilter* _tmp17_;
-	GtkFileFilter* filter;
-	GtkFileFilter* _tmp18_;
-	const gchar* _tmp19_ = NULL;
-	GtkFileFilter* _tmp20_;
-	GtkFileFilter* _tmp21_;
-	GtkFileChooserDialog* _tmp22_;
-	GtkFileFilter* _tmp23_;
-	GtkFileFilter* _tmp24_;
-	GtkFileFilter* _tmp25_;
-	const gchar* _tmp26_ = NULL;
-	GtkFileFilter* _tmp27_;
-	GtkFileChooserDialog* _tmp28_;
-	GtkFileFilter* _tmp29_;
-	const gchar* _tmp30_ = NULL;
-	GtkExpander* _tmp31_;
-	GtkExpander* expander;
-	GtkExpander* _tmp32_;
-	GtkFileChooserDialog* _tmp33_;
-	GtkExpander* _tmp34_;
-	gchar* _tmp35_;
-	gchar* default_extension;
-	const gchar* _tmp36_;
-	gint _tmp37_ = 0;
-	gint index;
-	gint _tmp38_;
-	GtkListStore* _tmp42_;
-	GtkListStore* file_type_store;
+	GtkApplicationWindow* _tmp9_ = NULL;
+	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	GtkFileChooserDialog* _tmp12_ = NULL;
+	GtkFileChooserDialog* _tmp13_ = NULL;
+	GtkFileChooserDialog* _tmp14_ = NULL;
+	GtkFileChooserDialog* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
+	GtkFileChooserDialog* _tmp17_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	GtkFileFilter* filter = NULL;
+	GtkFileFilter* _tmp19_ = NULL;
+	GtkFileFilter* _tmp20_ = NULL;
+	const gchar* _tmp21_ = NULL;
+	GtkFileFilter* _tmp22_ = NULL;
+	GtkFileFilter* _tmp23_ = NULL;
+	GtkFileChooserDialog* _tmp24_ = NULL;
+	GtkFileFilter* _tmp25_ = NULL;
+	GtkFileFilter* _tmp26_ = NULL;
+	GtkFileFilter* _tmp27_ = NULL;
+	GtkFileFilter* _tmp28_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	GtkFileFilter* _tmp30_ = NULL;
+	GtkFileChooserDialog* _tmp31_ = NULL;
+	GtkFileFilter* _tmp32_ = NULL;
+	GtkFileFilter* _tmp33_ = NULL;
+	GtkExpander* expander = NULL;
+	const gchar* _tmp34_ = NULL;
+	GtkExpander* _tmp35_ = NULL;
+	GtkExpander* _tmp36_ = NULL;
+	GtkFileChooserDialog* _tmp37_ = NULL;
+	GtkExpander* _tmp38_ = NULL;
+	gchar* default_extension = NULL;
+	gchar* _tmp39_ = NULL;
+	gint index = 0;
+	const gchar* _tmp40_ = NULL;
+	gint _tmp41_ = 0;
+	gint _tmp42_ = 0;
+	GtkListStore* file_type_store = NULL;
+	GtkListStore* _tmp46_ = NULL;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp43_;
-	GtkTreeIter _tmp44_ = {0};
-	GtkListStore* _tmp45_;
-	GtkTreeIter _tmp46_;
-	const gchar* _tmp47_ = NULL;
-	GtkListStore* _tmp48_;
-	GtkTreeIter _tmp49_ = {0};
-	GtkListStore* _tmp50_;
-	GtkTreeIter _tmp51_;
-	const gchar* _tmp52_ = NULL;
-	GtkListStore* _tmp53_;
-	GtkTreeIter _tmp54_ = {0};
-	GtkListStore* _tmp55_;
-	GtkTreeIter _tmp56_;
-	const gchar* _tmp57_ = NULL;
-	GtkListStore* _tmp58_;
-	GtkTreeView* _tmp59_;
-	GtkTreeView* file_type_view;
-	GtkTreeView* _tmp60_;
-	GtkTreeView* _tmp61_;
-	GtkCellRendererText* _tmp62_;
-	GtkCellRendererText* _tmp63_;
-	GtkTreeViewColumn* _tmp64_;
-	GtkTreeViewColumn* _tmp65_;
-	GtkTreeViewColumn* column;
-	GtkTreeView* _tmp66_;
-	GtkTreeViewColumn* _tmp67_;
-	GtkExpander* _tmp68_;
-	GtkTreeView* _tmp69_;
-	GtkListStore* _tmp70_;
-	GtkTreeIter _tmp71_ = {0};
-	gboolean _tmp72_ = FALSE;
-	GtkTreeView* _tmp84_;
-	GtkTreeSelection* _tmp85_ = NULL;
-	GtkExpander* _tmp86_;
-	GtkFileChooserDialog* _tmp87_;
-	gint _tmp88_ = 0;
-	gint response;
-	gchar* uri;
-	gint _tmp89_;
-	GSettings* _tmp109_;
-	GtkFileChooserDialog* _tmp110_;
-	gchar* _tmp111_ = NULL;
-	gchar* _tmp112_;
-	GtkTreeView* _tmp113_;
-	GtkTreeSelection* _tmp114_ = NULL;
-	guint _tmp115_ = 0U;
-	GtkFileChooserDialog* _tmp116_;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkListStore* _tmp47_ = NULL;
+	GtkTreeIter _tmp48_ = {0};
+	GtkListStore* _tmp49_ = NULL;
+	GtkTreeIter _tmp50_ = {0};
+	const gchar* _tmp51_ = NULL;
+	GtkListStore* _tmp52_ = NULL;
+	GtkTreeIter _tmp53_ = {0};
+	GtkListStore* _tmp54_ = NULL;
+	GtkTreeIter _tmp55_ = {0};
+	const gchar* _tmp56_ = NULL;
+	GtkListStore* _tmp57_ = NULL;
+	GtkTreeIter _tmp58_ = {0};
+	GtkListStore* _tmp59_ = NULL;
+	GtkTreeIter _tmp60_ = {0};
+	const gchar* _tmp61_ = NULL;
+	GtkTreeView* file_type_view = NULL;
+	GtkListStore* _tmp62_ = NULL;
+	GtkTreeView* _tmp63_ = NULL;
+	GtkTreeView* _tmp64_ = NULL;
+	GtkTreeView* _tmp65_ = NULL;
+	GtkTreeViewColumn* column = NULL;
+	GtkCellRendererText* _tmp66_ = NULL;
+	GtkCellRendererText* _tmp67_ = NULL;
+	GtkTreeViewColumn* _tmp68_ = NULL;
+	GtkTreeViewColumn* _tmp69_ = NULL;
+	GtkTreeView* _tmp70_ = NULL;
+	GtkTreeViewColumn* _tmp71_ = NULL;
+	GtkExpander* _tmp72_ = NULL;
+	GtkTreeView* _tmp73_ = NULL;
+	GtkListStore* _tmp74_ = NULL;
+	GtkTreeIter _tmp75_ = {0};
+	gboolean _tmp76_ = FALSE;
+	GtkTreeView* _tmp88_ = NULL;
+	GtkTreeSelection* _tmp89_ = NULL;
+	GtkExpander* _tmp90_ = NULL;
+	gint response = 0;
+	GtkFileChooserDialog* _tmp91_ = NULL;
+	gint _tmp92_ = 0;
+	gchar* uri = NULL;
+	gint _tmp93_ = 0;
+	GSettings* _tmp113_ = NULL;
+	GtkFileChooserDialog* _tmp114_ = NULL;
+	gchar* _tmp115_ = NULL;
+	gchar* _tmp116_ = NULL;
+	GtkTreeView* _tmp117_ = NULL;
+	GtkTreeSelection* _tmp118_ = NULL;
+	guint _tmp119_ = 0U;
+	GtkFileChooserDialog* _tmp120_ = NULL;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = NULL;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2099 "ui.c"
+#line 2236 "ui.c"
 	} else {
-		const gchar* _tmp4_;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp4_ = NULL;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2106 "ui.c"
+#line 2243 "ui.c"
 	}
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp2_;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 2112 "ui.c"
+#line 2249 "ui.c"
 		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gchar* _tmp7_ = NULL;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp7_;
-#line 2123 "ui.c"
+#line 2260 "ui.c"
 	}
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Save As...");
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp8_, _tmp9_, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp10_);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_dialog);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_dialog = _tmp10_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = self->priv->save_dialog;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = self->priv->save_dialog;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->save_dialog;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = directory;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->save_dialog;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = self->priv->default_file_name;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = gtk_file_filter_new ();
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp17_);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp17_;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = filter;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = _ ("Image Files");
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_set_name (_tmp18_, _tmp19_);
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = filter;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pixbuf_formats (_tmp20_);
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = filter;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = self->priv->save_dialog;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = filter;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp23_);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = gtk_file_filter_new ();
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp24_);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (filter);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp24_;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = filter;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = _ ("All Files");
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_set_name (_tmp25_, _tmp26_);
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = filter;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pattern (_tmp27_, "*");
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = self->priv->save_dialog;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = filter;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp28_, _tmp29_);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = _ ("Select File _Type");
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp30_);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp31_);
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	expander = _tmp31_;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = expander;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_expander_set_spacing (_tmp32_, 5);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = self->priv->save_dialog;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = expander;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp33_, (GtkWidget*) _tmp34_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = g_strdup ("");
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	default_extension = _tmp35_;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = self->priv->default_file_name;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = string_last_index_of_char (_tmp36_, (gunichar) '.', 0);
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp37_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = index;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp38_ >= 0) {
-#line 2239 "ui.c"
-		const gchar* _tmp39_;
-		gint _tmp40_;
-		gchar* _tmp41_ = NULL;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp39_ = self->priv->default_file_name;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp40_ = index;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp41_ = string_substring (_tmp39_, (glong) _tmp40_, (glong) (-1));
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (default_extension);
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		default_extension = _tmp41_;
-#line 2253 "ui.c"
-	}
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file_type_store = _tmp42_;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp43_ = file_type_store;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp43_, &_tmp44_);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp44_;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp45_ = file_type_store;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = iter;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = _ ("PDF (multi-page document)");
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".pdf", -1, -1);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = file_type_store;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp48_, &_tmp49_);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp49_;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = file_type_store;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = iter;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = _ ("JPEG (compressed)");
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp50_, &_tmp51_, 0, _tmp52_, 1, ".jpg", -1, -1);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = file_type_store;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp53_, &_tmp54_);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp54_;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = file_type_store;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = iter;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = _ ("PNG (lossless)");
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp55_, &_tmp56_, 0, _tmp57_, 1, ".png", -1, -1);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = file_type_store;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp58_);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp59_);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file_type_view = _tmp59_;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = file_type_view;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_set_headers_visible (_tmp60_, FALSE);
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = file_type_view;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_set_rules_hint (_tmp61_, TRUE);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp62_);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = _tmp62_;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp63_, "text", 0, NULL, NULL);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp64_);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = _tmp64_;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_tmp63_);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	column = _tmp65_;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = file_type_view;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = column;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_append_column (_tmp66_, _tmp67_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = expander;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = file_type_view;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _tmp68_, (GtkWidget*) _tmp69_);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = file_type_store;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp70_, &_tmp71_);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp71_;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp72_) {
-#line 2353 "ui.c"
-		{
-			gboolean _tmp73_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp73_ = TRUE;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 2360 "ui.c"
-				gboolean _tmp74_;
-				gchar* e = NULL;
-				GtkListStore* _tmp77_;
-				GtkTreeIter _tmp78_;
-				const gchar* _tmp79_;
-				const gchar* _tmp80_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp74_ = _tmp73_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp74_) {
-#line 2371 "ui.c"
-					GtkListStore* _tmp75_;
-					gboolean _tmp76_ = FALSE;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp75_ = file_type_store;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp76_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp75_, &iter);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp76_) {
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 2382 "ui.c"
-					}
-				}
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp73_ = FALSE;
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp77_ = file_type_store;
+	_tmp10_ = _ ("_Cancel");
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp78_ = iter;
+	_tmp11_ = _ ("_Save");
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp77_, &_tmp78_, 1, &e, -1, -1);
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp79_ = default_extension;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp80_ = e;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp79_, _tmp80_) == 0) {
-#line 2399 "ui.c"
-					GtkTreeView* _tmp81_;
-					GtkTreeSelection* _tmp82_ = NULL;
-					GtkTreeIter _tmp83_;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp81_ = file_type_view;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp82_ = gtk_tree_view_get_selection (_tmp81_);
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp83_ = iter;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_tree_selection_select_iter (_tmp82_, &_tmp83_);
-#line 2411 "ui.c"
-				}
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (e);
-#line 2415 "ui.c"
-			}
-		}
-	}
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp84_ = file_type_view;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = gtk_tree_view_get_selection (_tmp84_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp85_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
+	_tmp12_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp8_, (GtkWindow*) _tmp9_, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp10_, GTK_RESPONSE_CANCEL, _tmp11_, GTK_RESPONSE_ACCEPT, NULL, NULL);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp12_);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->save_dialog);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_dialog = _tmp12_;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = expander;
+	_tmp13_ = self->priv->save_dialog;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show_all ((GtkWidget*) _tmp86_);
+	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp13_, TRUE);
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = self->priv->save_dialog;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp14_, FALSE);
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp87_ = self->priv->save_dialog;
+	_tmp15_ = self->priv->save_dialog;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = gtk_dialog_run ((GtkDialog*) _tmp87_);
+	_tmp16_ = directory;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp88_;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri = NULL;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = response;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp89_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2441 "ui.c"
-		GtkTreeView* _tmp90_;
-		GtkTreeSelection* _tmp91_ = NULL;
-		GtkTreeSelection* _tmp92_;
-		GtkTreeSelection* selection;
-		GtkTreeSelection* _tmp93_;
-		gchar* _tmp94_ = NULL;
-		gchar* extension;
-		GtkFileChooserDialog* _tmp95_;
-		gchar* _tmp96_ = NULL;
-		gchar* path;
-		const gchar* _tmp97_;
-		gchar* _tmp98_ = NULL;
-		gchar* filename;
-		const gchar* _tmp99_;
-		gint _tmp100_ = 0;
-		gint extension_index;
-		gint _tmp101_;
-		const gchar* _tmp105_;
-		GFile* _tmp106_ = NULL;
-		GFile* _tmp107_;
-		gchar* _tmp108_ = NULL;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp90_ = file_type_view;
+	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp15_, _tmp16_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = self->priv->save_dialog;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = self->priv->_default_file_name;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp17_, _tmp18_);
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = gtk_file_filter_new ();
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp19_);
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filter = _tmp19_;
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp91_ = gtk_tree_view_get_selection (_tmp90_);
+	_tmp20_ = filter;
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp92_ = _g_object_ref0 (_tmp91_);
+	_tmp21_ = _ ("Image Files");
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		selection = _tmp92_;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp93_ = selection;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp94_ = user_interface_get_selected_extension (self, _tmp93_);
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension = _tmp94_;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp95_ = self->priv->save_dialog;
+	gtk_file_filter_set_name (_tmp20_, _tmp21_);
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = filter;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_pixbuf_formats (_tmp22_);
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp96_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp95_);
+	_tmp23_ = filter;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		path = _tmp96_;
+	gtk_file_filter_add_mime_type (_tmp23_, "application/pdf");
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = self->priv->save_dialog;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp97_ = path;
+	_tmp25_ = filter;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp98_ = g_path_get_basename (_tmp97_);
+	_tmp26_ = _g_object_ref0 (_tmp25_);
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		filename = _tmp98_;
+	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp24_, _tmp26_);
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = gtk_file_filter_new ();
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp27_);
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (filter);
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filter = _tmp27_;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp99_ = filename;
+	_tmp28_ = filter;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp100_ = string_last_index_of_char (_tmp99_, (gunichar) '.', 0);
+	_tmp29_ = _ ("All Files");
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension_index = _tmp100_;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp101_ = extension_index;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp101_ < 0) {
-#line 2499 "ui.c"
-			const gchar* _tmp102_;
-			const gchar* _tmp103_;
-			gchar* _tmp104_;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp102_ = path;
+	gtk_file_filter_set_name (_tmp28_, _tmp29_);
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp103_ = extension;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp104_ = g_strconcat (_tmp102_, _tmp103_, NULL);
+	_tmp30_ = filter;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_pattern (_tmp30_, "*");
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = self->priv->save_dialog;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = filter;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = _g_object_ref0 (_tmp32_);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp31_, _tmp33_);
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = _ ("Select File _Type");
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp34_);
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp35_);
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	expander = _tmp35_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp36_ = expander;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_expander_set_spacing (_tmp36_, 5);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = self->priv->save_dialog;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = expander;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp37_, (GtkWidget*) _tmp38_);
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = g_strdup ("");
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	default_extension = _tmp39_;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = self->priv->_default_file_name;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp41_ = string_last_index_of_char (_tmp40_, (gunichar) '.', 0);
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = _tmp41_;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = index;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp42_ >= 0) {
+#line 2384 "ui.c"
+		const gchar* _tmp43_ = NULL;
+		gint _tmp44_ = 0;
+		gchar* _tmp45_ = NULL;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp43_ = self->priv->_default_file_name;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp44_ = index;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp45_ = string_substring (_tmp43_, (glong) _tmp44_, (glong) (-1));
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (default_extension);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		default_extension = _tmp45_;
+#line 2398 "ui.c"
+	}
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp46_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	file_type_store = _tmp46_;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp47_ = file_type_store;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp47_, &_tmp48_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp48_;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp49_ = file_type_store;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp50_ = iter;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp51_ = _ ("PDF (multi-page document)");
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp49_, &_tmp50_, 0, _tmp51_, 1, ".pdf", -1, -1);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp52_ = file_type_store;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp52_, &_tmp53_);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp53_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = file_type_store;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp55_ = iter;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp56_ = _ ("JPEG (compressed)");
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp54_, &_tmp55_, 0, _tmp56_, 1, ".jpg", -1, -1);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = file_type_store;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp57_, &_tmp58_);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp58_;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp59_ = file_type_store;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp60_ = iter;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp61_ = _ ("PNG (lossless)");
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp59_, &_tmp60_, 0, _tmp61_, 1, ".png", -1, -1);
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = file_type_store;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp62_);
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp63_);
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	file_type_view = _tmp63_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = file_type_view;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_tree_view_set_headers_visible (_tmp64_, FALSE);
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp65_ = file_type_view;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_tree_view_set_rules_hint (_tmp65_, TRUE);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp66_);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp67_ = _tmp66_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp67_, "text", 0, NULL, NULL);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp68_);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = _tmp68_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_tmp67_);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	column = _tmp69_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp70_ = file_type_view;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp71_ = column;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_tree_view_append_column (_tmp70_, _tmp71_);
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp72_ = expander;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp73_ = file_type_view;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) _tmp72_, (GtkWidget*) _tmp73_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp74_ = file_type_store;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp76_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp74_, &_tmp75_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp75_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp76_) {
+#line 2498 "ui.c"
+		{
+			gboolean _tmp77_ = FALSE;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp77_ = TRUE;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			while (TRUE) {
+#line 2505 "ui.c"
+				gboolean _tmp78_ = FALSE;
+				gchar* e = NULL;
+				GtkListStore* _tmp81_ = NULL;
+				GtkTreeIter _tmp82_ = {0};
+				const gchar* _tmp83_ = NULL;
+				const gchar* _tmp84_ = NULL;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp78_ = _tmp77_;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!_tmp78_) {
+#line 2516 "ui.c"
+					GtkListStore* _tmp79_ = NULL;
+					gboolean _tmp80_ = FALSE;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp79_ = file_type_store;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp80_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp79_, &iter);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (!_tmp80_) {
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						break;
+#line 2527 "ui.c"
+					}
+				}
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp77_ = FALSE;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp81_ = file_type_store;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp82_ = iter;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_tree_model_get ((GtkTreeModel*) _tmp81_, &_tmp82_, 1, &e, -1, -1);
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp83_ = default_extension;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp84_ = e;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp83_, _tmp84_) == 0) {
+#line 2544 "ui.c"
+					GtkTreeView* _tmp85_ = NULL;
+					GtkTreeSelection* _tmp86_ = NULL;
+					GtkTreeIter _tmp87_ = {0};
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp85_ = file_type_view;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp86_ = gtk_tree_view_get_selection (_tmp85_);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp87_ = iter;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_tree_selection_select_iter (_tmp86_, &_tmp87_);
+#line 2556 "ui.c"
+				}
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (e);
+#line 2560 "ui.c"
+			}
+		}
+	}
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp88_ = file_type_view;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp89_ = gtk_tree_view_get_selection (_tmp88_);
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp89_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp90_ = expander;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show_all ((GtkWidget*) _tmp90_);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp91_ = self->priv->save_dialog;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp92_ = gtk_dialog_run ((GtkDialog*) _tmp91_);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	response = _tmp92_;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	uri = NULL;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp93_ = response;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp93_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+#line 2586 "ui.c"
+		GtkTreeSelection* selection = NULL;
+		GtkTreeView* _tmp94_ = NULL;
+		GtkTreeSelection* _tmp95_ = NULL;
+		GtkTreeSelection* _tmp96_ = NULL;
+		gchar* extension = NULL;
+		GtkTreeSelection* _tmp97_ = NULL;
+		gchar* _tmp98_ = NULL;
+		gchar* path = NULL;
+		GtkFileChooserDialog* _tmp99_ = NULL;
+		gchar* _tmp100_ = NULL;
+		gchar* filename = NULL;
+		const gchar* _tmp101_ = NULL;
+		gchar* _tmp102_ = NULL;
+		gint extension_index = 0;
+		const gchar* _tmp103_ = NULL;
+		gint _tmp104_ = 0;
+		gint _tmp105_ = 0;
+		const gchar* _tmp109_ = NULL;
+		GFile* _tmp110_ = NULL;
+		GFile* _tmp111_ = NULL;
+		gchar* _tmp112_ = NULL;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp94_ = file_type_view;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp95_ = gtk_tree_view_get_selection (_tmp94_);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp96_ = _g_object_ref0 (_tmp95_);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		selection = _tmp96_;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp97_ = selection;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp98_ = user_interface_get_selected_extension (self, _tmp97_);
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension = _tmp98_;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp99_ = self->priv->save_dialog;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp100_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp99_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		path = _tmp100_;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp101_ = path;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp102_ = g_path_get_basename (_tmp101_);
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		filename = _tmp102_;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp103_ = filename;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp104_ = string_last_index_of_char (_tmp103_, (gunichar) '.', 0);
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension_index = _tmp104_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp105_ = extension_index;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp105_ < 0) {
+#line 2644 "ui.c"
+			const gchar* _tmp106_ = NULL;
+			const gchar* _tmp107_ = NULL;
+			gchar* _tmp108_ = NULL;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp106_ = path;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp107_ = extension;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp108_ = g_strconcat (_tmp106_, _tmp107_, NULL);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (path);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			path = _tmp104_;
-#line 2513 "ui.c"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			path = _tmp108_;
+#line 2658 "ui.c"
 		}
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp105_ = path;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp106_ = g_file_new_for_path (_tmp105_);
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp107_ = _tmp106_;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp108_ = g_file_get_uri (_tmp107_);
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp109_ = path;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp110_ = g_file_new_for_path (_tmp109_);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp111_ = _tmp110_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp112_ = g_file_get_uri (_tmp111_);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp108_;
-#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_tmp107_);
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		uri = _tmp112_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_tmp111_);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (selection);
-#line 2537 "ui.c"
+#line 2682 "ui.c"
 	}
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp109_ = self->priv->settings;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp110_ = self->priv->save_dialog;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp110_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp112_ = _tmp111_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_string (_tmp109_, "save-directory", _tmp112_);
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp112_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = file_type_view;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = gtk_tree_view_get_selection (_tmp113_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp115_, NULL, FALSE);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp114_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp115_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = self->priv->save_dialog;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp116_);
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp113_ = self->priv->settings;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp114_ = self->priv->save_dialog;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp115_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp114_);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp116_ = _tmp115_;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_string (_tmp113_, "save-directory", _tmp116_);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp116_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp117_ = file_type_view;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp118_ = gtk_tree_view_get_selection (_tmp117_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp119_, NULL, FALSE);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp118_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp119_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp120_ = self->priv->save_dialog;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp120_);
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = NULL;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = uri;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (column);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_view);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_store);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (default_extension);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (expander);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2585 "ui.c"
+#line 2730 "ui.c"
 }
 
 
@@ -2589,214 +2734,217 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gboolean result = FALSE;
 	gchar* uri = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_;
-	gboolean _tmp3_;
-	const gchar* _tmp7_;
-	const gchar* _tmp8_;
+	const gchar* _tmp1_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp7_ = NULL;
+	GFile* file = NULL;
+	const gchar* _tmp8_ = NULL;
 	GFile* _tmp9_ = NULL;
-	GFile* file;
-	const gchar* _tmp10_;
-	const gchar* _tmp11_;
+	const gchar* _tmp10_ = NULL;
+	gchar* uri_lower = NULL;
+	const gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-	gchar* uri_lower;
-	gchar* _tmp13_;
-	gchar* format;
-	const gchar* _tmp14_;
+	gchar* format = NULL;
+	gchar* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-	const gchar* _tmp39_;
-	gchar* _tmp40_;
-	Book* _tmp41_;
+	const gchar* _tmp40_ = NULL;
+	gchar* _tmp41_ = NULL;
+	Book* _tmp42_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2617 "ui.c"
-		gboolean _tmp2_;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2762 "ui.c"
+		gboolean _tmp2_ = FALSE;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2623 "ui.c"
+#line 2768 "ui.c"
 	} else {
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2627 "ui.c"
+#line 2772 "ui.c"
 	}
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp0_;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 2633 "ui.c"
-		const gchar* _tmp4_;
-		gchar* _tmp5_;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2778 "ui.c"
+		const gchar* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->book_uri;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2644 "ui.c"
+#line 2789 "ui.c"
 	} else {
 		gchar* _tmp6_ = NULL;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = user_interface_choose_file_location (self);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp6_;
-#line 2653 "ui.c"
+#line 2798 "ui.c"
 	}
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2665 "ui.c"
+#line 2810 "ui.c"
 	}
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = uri;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_file_new_for_uri (_tmp8_);
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp9_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:480: Saving to '%s'", _tmp10_);
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:550: Saving to '%s'", _tmp10_);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = uri;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) (-1));
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri_lower = _tmp12_;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = g_strdup ("jpeg");
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	format = _tmp13_;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = uri_lower;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = g_str_has_suffix (_tmp14_, ".pdf");
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp15_) {
-#line 2693 "ui.c"
-		gchar* _tmp16_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2838 "ui.c"
+		gchar* _tmp16_ = NULL;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = g_strdup ("pdf");
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp16_;
-#line 2701 "ui.c"
+#line 2846 "ui.c"
 	} else {
-		const gchar* _tmp17_;
+		const gchar* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = uri_lower;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = g_str_has_suffix (_tmp17_, ".ps");
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp18_) {
-#line 2711 "ui.c"
-			gchar* _tmp19_;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2856 "ui.c"
+			gchar* _tmp19_ = NULL;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = g_strdup ("ps");
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp19_;
-#line 2719 "ui.c"
+#line 2864 "ui.c"
 		} else {
-			const gchar* _tmp20_;
+			const gchar* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = uri_lower;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = g_str_has_suffix (_tmp20_, ".png");
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp21_) {
-#line 2729 "ui.c"
-				gchar* _tmp22_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2874 "ui.c"
+				gchar* _tmp22_ = NULL;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp22_ = g_strdup ("png");
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp22_;
-#line 2737 "ui.c"
+#line 2882 "ui.c"
 			} else {
 				gboolean _tmp23_ = FALSE;
-				const gchar* _tmp24_;
+				const gchar* _tmp24_ = NULL;
 				gboolean _tmp25_ = FALSE;
-				gboolean _tmp28_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gboolean _tmp28_ = FALSE;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp24_ = uri_lower;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp25_ = g_str_has_suffix (_tmp24_, ".tif");
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp25_) {
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = TRUE;
-#line 2751 "ui.c"
+#line 2896 "ui.c"
 				} else {
-					const gchar* _tmp26_;
+					const gchar* _tmp26_ = NULL;
 					gboolean _tmp27_ = FALSE;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = uri_lower;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_str_has_suffix (_tmp26_, ".tiff");
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = _tmp27_;
-#line 2761 "ui.c"
+#line 2906 "ui.c"
 				}
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp28_ = _tmp23_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp28_) {
-#line 2767 "ui.c"
-					gchar* _tmp29_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2912 "ui.c"
+					gchar* _tmp29_ = NULL;
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp29_ = g_strdup ("tiff");
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp29_;
-#line 2775 "ui.c"
+#line 2920 "ui.c"
 				}
 			}
 		}
 	}
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 2782 "ui.c"
+#line 2927 "ui.c"
 	{
-		Book* _tmp30_;
-		const gchar* _tmp31_;
+		Book* _tmp30_ = NULL;
+		const gchar* _tmp31_ = NULL;
 		gint _tmp32_ = 0;
-		GFile* _tmp33_;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = self->priv->book;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gint _tmp33_ = 0;
+		GFile* _tmp34_ = NULL;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp30_ = self->priv->_book;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = format;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = user_interface_get_quality (self);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = file;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_save (_tmp30_, _tmp31_, _tmp32_, _tmp33_, &_inner_error_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp33_ = _tmp32_;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp34_ = file;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_save (_tmp30_, _tmp31_, _tmp33_, _tmp34_, &_inner_error_);
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 2800 "ui.c"
+#line 2948 "ui.c"
 			goto __catch16_g_error;
 		}
 	}
@@ -2804,469 +2952,515 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	__catch16_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp34_;
-		const gchar* _tmp35_;
+		GError* _tmp35_ = NULL;
 		const gchar* _tmp36_ = NULL;
-		GError* _tmp37_;
-		const gchar* _tmp38_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp37_ = NULL;
+		GError* _tmp38_ = NULL;
+		const gchar* _tmp39_ = NULL;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_hide_progress_dialog (self);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = e;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp35_ = _tmp34_->message;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:501: Error saving file: %s", _tmp35_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp36_ = _ ("Failed to save file");
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp37_ = e;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp38_ = _tmp37_->message;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error (self, _tmp36_, _tmp38_, FALSE);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp35_ = e;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp36_ = _tmp35_->message;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:571: Error saving file: %s", _tmp36_);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp37_ = _ ("Failed to save file");
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp38_ = e;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp39_ = _tmp38_->message;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error (self, _tmp37_, _tmp39_, FALSE);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2847 "ui.c"
+#line 2995 "ui.c"
 	}
 	__finally16:
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 2866 "ui.c"
+#line 3014 "ui.c"
 	}
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = uri;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = g_strdup (_tmp39_);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = uri;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp41_ = g_strdup (_tmp40_);
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = _tmp40_;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = self->priv->book;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp41_, FALSE);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_uri = _tmp41_;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = self->priv->_book;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_set_needs_saving (_tmp42_, FALSE);
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2892 "ui.c"
+#line 3040 "ui.c"
 }
 
 
 static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar* title, const gchar* discard_label) {
 	gboolean result = FALSE;
-	Book* _tmp0_;
+	Book* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	GtkWindow* _tmp2_;
-	const gchar* _tmp3_;
-	GtkMessageDialog* _tmp4_;
-	GtkMessageDialog* dialog;
-	GtkMessageDialog* _tmp5_;
-	const gchar* _tmp6_ = NULL;
-	GtkMessageDialog* _tmp7_;
-	const gchar* _tmp8_;
-	GtkMessageDialog* _tmp9_;
-	GtkMessageDialog* _tmp10_;
-	GtkMessageDialog* _tmp11_;
-	gint _tmp12_ = 0;
-	gint response;
-	GtkMessageDialog* _tmp13_;
-	gint _tmp14_;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+	GtkMessageDialog* dialog = NULL;
+	GtkApplicationWindow* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	GtkMessageDialog* _tmp5_ = NULL;
+	GtkMessageDialog* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	GtkMessageDialog* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	GtkMessageDialog* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	GtkMessageDialog* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	gint response = 0;
+	GtkMessageDialog* _tmp14_ = NULL;
+	gint _tmp15_ = 0;
+	GtkMessageDialog* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp1_) {
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp2_) {
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2931 "ui.c"
-	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->window;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = title;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp2_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp4_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dialog = _tmp4_;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = dialog;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = dialog;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = discard_label;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = dialog;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp9_, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3084 "ui.c"
+	}
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->window;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = title;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp4_);
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp5_);
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dialog = _tmp5_;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = dialog;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = _ ("If you don't save, changes will be permanently lost.");
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_message_dialog_format_secondary_text (_tmp6_, "%s", _tmp7_);
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = dialog;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = discard_label;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp8_, _tmp9_, (gint) GTK_RESPONSE_NO);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = dialog;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp10_, GTK_STOCK_SAVE, (gint) GTK_RESPONSE_YES);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = dialog;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = gtk_dialog_run ((GtkDialog*) _tmp11_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp12_;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = dialog;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp13_);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = response;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_tmp14_) {
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = _ ("_Cancel");
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp10_, _tmp11_, (gint) GTK_RESPONSE_CANCEL);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = dialog;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = _ ("_Save");
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp12_, _tmp13_, (gint) GTK_RESPONSE_YES);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = dialog;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = gtk_dialog_run ((GtkDialog*) _tmp14_);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	response = _tmp15_;
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = dialog;
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp16_);
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = response;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (_tmp17_) {
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 2979 "ui.c"
+#line 3136 "ui.c"
 		{
-			gboolean _tmp15_ = FALSE;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp15_ = user_interface_save_document (self, FALSE);
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp15_) {
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gboolean _tmp18_ = FALSE;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp18_ = user_interface_save_document (self, FALSE);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp18_) {
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 2992 "ui.c"
+#line 3149 "ui.c"
 			} else {
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3000 "ui.c"
+#line 3157 "ui.c"
 			}
 		}
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_CANCEL:
-#line 3005 "ui.c"
+#line 3162 "ui.c"
 		{
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3013 "ui.c"
+#line 3170 "ui.c"
 		}
 		default:
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3018 "ui.c"
+#line 3175 "ui.c"
 		{
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3026 "ui.c"
+#line 3183 "ui.c"
 		}
 	}
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3031 "ui.c"
+#line 3188 "ui.c"
 }
 
 
 static void user_interface_clear_document (UserInterface* self) {
-	Book* _tmp0_;
-	Book* _tmp1_;
-	GtkMenuItem* _tmp2_;
-	GtkMenuItem* _tmp3_;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
+	GtkMenuItem* _tmp2_ = NULL;
+	GtkMenuItem* _tmp3_ = NULL;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->book;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = self->priv->_book;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3064 "ui.c"
+#line 3221 "ui.c"
 }
 
 
-void G_MODULE_EXPORT new_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_new_document (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3087 "ui.c"
+#line 3243 "ui.c"
 	}
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->scanning;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = user_interface_get_scanning (self);
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _tmp3_;
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3095 "ui.c"
+#line 3253 "ui.c"
 	}
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3099 "ui.c"
+#line 3257 "ui.c"
 }
 
 
-static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+void G_MODULE_EXPORT new_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (widget != NULL);
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_new_document (self);
+#line 3268 "ui.c"
+}
+
+
+void user_interface_new_document_activate_cb (UserInterface* self) {
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_new_document (self);
+#line 3277 "ui.c"
+}
+
+
+static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint, gboolean save) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp8_ = FALSE;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3123 "ui.c"
-		GtkRadioMenuItem* _tmp3_;
-		GtkRadioMenuItem* _tmp4_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3302 "ui.c"
+		GtkRadioMenuItem* _tmp3_ = NULL;
+		GtkRadioMenuItem* _tmp4_ = NULL;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_toolbar_menuitem;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_menu_menuitem;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 3134 "ui.c"
+#line 3313 "ui.c"
 	} else {
-		const gchar* _tmp5_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp5_ = NULL;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = document_hint;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp5_, "photo") == 0) {
-#line 3141 "ui.c"
-			GtkRadioMenuItem* _tmp6_;
-			GtkRadioMenuItem* _tmp7_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3320 "ui.c"
+			GtkRadioMenuItem* _tmp6_ = NULL;
+			GtkRadioMenuItem* _tmp7_ = NULL;
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = self->priv->photo_toolbar_menuitem;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp6_, TRUE);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_menu_menuitem;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 3152 "ui.c"
+#line 3331 "ui.c"
 		}
 	}
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = save;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp8_) {
+#line 3338 "ui.c"
+		GSettings* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = self->priv->settings;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = document_hint;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_settings_set_string (_tmp9_, "document-type", _tmp10_);
+#line 3347 "ui.c"
+	}
 }
 
 
 void G_MODULE_EXPORT text_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, "text");
-#line 3173 "ui.c"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_document_hint (self, "text", TRUE);
+#line 3367 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT photo_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, "photo");
-#line 3193 "ui.c"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_document_hint (self, "photo", TRUE);
+#line 3387 "ui.c"
 	}
 }
 
 
 static void user_interface_set_page_side (UserInterface* self, ScanType page_side) {
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp0_;
+	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3213 "ui.c"
+#line 3407 "ui.c"
 		{
-			gboolean _tmp3_;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gboolean _tmp3_ = FALSE;
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3220 "ui.c"
-				gboolean _tmp4_;
+#line 3414 "ui.c"
+				gboolean _tmp4_ = FALSE;
 				gint s = 0;
-				GtkListStore* _tmp7_;
-				GtkTreeIter _tmp8_;
-				gint _tmp9_;
-				ScanType _tmp10_;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				GtkListStore* _tmp7_ = NULL;
+				GtkTreeIter _tmp8_ = {0};
+				gint _tmp9_ = 0;
+				ScanType _tmp10_ = 0;
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = _tmp3_;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp4_) {
-#line 3231 "ui.c"
-					GtkListStore* _tmp5_;
+#line 3425 "ui.c"
+					GtkListStore* _tmp5_ = NULL;
 					gboolean _tmp6_ = FALSE;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = self->priv->page_side_model;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp6_) {
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3242 "ui.c"
+#line 3436 "ui.c"
 					}
 				}
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = self->priv->page_side_model;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = iter;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &s, -1, -1);
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = s;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = page_side;
-#line 613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == ((gint) _tmp10_)) {
-#line 3259 "ui.c"
-					GtkComboBox* _tmp11_;
-					GtkTreeIter _tmp12_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3453 "ui.c"
+					GtkComboBox* _tmp11_ = NULL;
+					GtkTreeIter _tmp12_ = {0};
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = self->priv->page_side_combo;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = iter;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp11_, &_tmp12_);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3270 "ui.c"
+#line 3464 "ui.c"
 				}
 			}
 		}
@@ -3277,296 +3471,251 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 static void user_interface_set_paper_size (UserInterface* self, gint width, gint height) {
 	GtkTreeIter iter = {0};
 	gboolean have_iter = FALSE;
-	gboolean _tmp16_;
-	gboolean _tmp20_;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp16_ = FALSE;
+	gboolean _tmp20_ = FALSE;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3285 "ui.c"
+#line 3479 "ui.c"
 	{
-		GtkListStore* _tmp0_;
+		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
-		gboolean _tmp3_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gboolean _tmp3_ = FALSE;
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3303 "ui.c"
-			gboolean _tmp4_;
-			gboolean _tmp7_;
+#line 3497 "ui.c"
+			gboolean _tmp4_ = FALSE;
+			gboolean _tmp7_ = FALSE;
 			gint w = 0;
 			gint h = 0;
-			GtkListStore* _tmp8_;
-			GtkTreeIter _tmp9_;
+			GtkListStore* _tmp8_ = NULL;
+			GtkTreeIter _tmp9_ = {0};
 			gboolean _tmp10_ = FALSE;
-			gint _tmp11_;
-			gint _tmp12_;
-			gboolean _tmp15_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gint _tmp11_ = 0;
+			gint _tmp12_ = 0;
+			gboolean _tmp15_ = FALSE;
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp4_ = _tmp3_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp4_) {
-#line 3318 "ui.c"
-				GtkListStore* _tmp5_;
+#line 3512 "ui.c"
+				GtkListStore* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = self->priv->paper_size_model;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp6_;
-#line 3327 "ui.c"
+#line 3521 "ui.c"
 			}
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = have_iter;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp7_) {
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3337 "ui.c"
+#line 3531 "ui.c"
 			}
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->paper_size_model;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = iter;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &w, 1, &h, -1, -1);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = w;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = width;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp11_ == _tmp12_) {
-#line 3351 "ui.c"
-				gint _tmp13_;
-				gint _tmp14_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3545 "ui.c"
+				gint _tmp13_ = 0;
+				gint _tmp14_ = 0;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = h;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = height;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = _tmp13_ == _tmp14_;
-#line 3360 "ui.c"
+#line 3554 "ui.c"
 			} else {
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = FALSE;
-#line 3364 "ui.c"
+#line 3558 "ui.c"
 			}
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = _tmp10_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp15_) {
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3372 "ui.c"
+#line 3566 "ui.c"
 			}
 		}
 	}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = have_iter;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp16_) {
-#line 3380 "ui.c"
-		GtkListStore* _tmp17_;
+#line 3574 "ui.c"
+		GtkListStore* _tmp17_ = NULL;
 		GtkTreeIter _tmp18_ = {0};
 		gboolean _tmp19_ = FALSE;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = self->priv->paper_size_model;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp17_, &_tmp18_);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp18_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp19_;
-#line 3392 "ui.c"
+#line 3586 "ui.c"
 	}
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = have_iter;
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp20_) {
-#line 3398 "ui.c"
-		GtkComboBox* _tmp21_;
-		GtkTreeIter _tmp22_;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3592 "ui.c"
+		GtkComboBox* _tmp21_ = NULL;
+		GtkTreeIter _tmp22_ = {0};
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = self->priv->paper_size_combo;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = iter;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp21_, &_tmp22_);
-#line 3407 "ui.c"
+#line 3601 "ui.c"
 	}
 }
 
 
-static void user_interface_set_brightness (UserInterface* self, gint brightness) {
-	GtkAdjustment* _tmp0_;
-	gint _tmp1_;
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->brightness_adjustment;
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = brightness;
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 3423 "ui.c"
-}
-
-
-static void user_interface_set_contrast (UserInterface* self, gint contrast) {
-	GtkAdjustment* _tmp0_;
-	gint _tmp1_;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->contrast_adjustment;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = contrast;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 3438 "ui.c"
-}
-
-
-static void user_interface_set_quality (UserInterface* self, gint quality) {
-	GtkAdjustment* _tmp0_;
-	gint _tmp1_;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->quality_adjustment;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = quality;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 3453 "ui.c"
-}
-
-
 static gint user_interface_get_text_dpi (UserInterface* self) {
 	gint result = 0;
 	GtkTreeIter iter = {0};
-	gint dpi;
-	GtkComboBox* _tmp0_;
+	gint dpi = 0;
+	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3476 "ui.c"
-		GtkListStore* _tmp3_;
-		GtkTreeIter _tmp4_;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3625 "ui.c"
+		GtkListStore* _tmp3_ = NULL;
+		GtkTreeIter _tmp4_ = {0};
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3485 "ui.c"
+#line 3634 "ui.c"
 	}
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3491 "ui.c"
+#line 3640 "ui.c"
 }
 
 
 static gint user_interface_get_photo_dpi (UserInterface* self) {
 	gint result = 0;
 	GtkTreeIter iter = {0};
-	gint dpi;
-	GtkComboBox* _tmp0_;
+	gint dpi = 0;
+	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3514 "ui.c"
-		GtkListStore* _tmp3_;
-		GtkTreeIter _tmp4_;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3663 "ui.c"
+		GtkListStore* _tmp3_ = NULL;
+		GtkTreeIter _tmp4_ = {0};
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3523 "ui.c"
+#line 3672 "ui.c"
 	}
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3529 "ui.c"
+#line 3678 "ui.c"
 }
 
 
 static ScanType user_interface_get_page_side (UserInterface* self) {
 	ScanType result = 0;
 	GtkTreeIter iter = {0};
-	gint page_side;
-	GtkComboBox* _tmp0_;
+	gint page_side = 0;
+	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-	gint _tmp5_;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp5_ = 0;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3553 "ui.c"
-		GtkListStore* _tmp3_;
-		GtkTreeIter _tmp4_;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3702 "ui.c"
+		GtkListStore* _tmp3_ = NULL;
+		GtkTreeIter _tmp4_ = {0};
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3562 "ui.c"
+#line 3711 "ui.c"
 	}
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3570 "ui.c"
+#line 3719 "ui.c"
 }
 
 
@@ -3575,570 +3724,572 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	gint _vala_height = 0;
 	gboolean result = FALSE;
 	GtkTreeIter iter = {0};
-	gint _tmp0_;
-	GtkComboBox* _tmp1_;
+	gint _tmp0_ = 0;
+	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3599 "ui.c"
-		GtkListStore* _tmp4_;
-		GtkTreeIter _tmp5_;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3748 "ui.c"
+		GtkListStore* _tmp4_ = NULL;
+		GtkTreeIter _tmp5_ = {0};
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3614 "ui.c"
+#line 3763 "ui.c"
 		}
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3620 "ui.c"
+#line 3769 "ui.c"
 		}
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3624 "ui.c"
+#line 3773 "ui.c"
 	}
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3632 "ui.c"
+#line 3781 "ui.c"
 	}
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3638 "ui.c"
+#line 3787 "ui.c"
 	}
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3642 "ui.c"
-}
-
-
-static gint user_interface_get_brightness (UserInterface* self) {
-	gint result = 0;
-	GtkAdjustment* _tmp0_;
-	gdouble _tmp1_ = 0.0;
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->brightness_adjustment;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp1_;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3660 "ui.c"
-}
-
-
-static gint user_interface_get_contrast (UserInterface* self) {
-	gint result = 0;
-	GtkAdjustment* _tmp0_;
-	gdouble _tmp1_ = 0.0;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->contrast_adjustment;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp1_;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 3678 "ui.c"
-}
-
-
-static gint user_interface_get_quality (UserInterface* self) {
-	gint result = 0;
-	GtkAdjustment* _tmp0_;
-	gdouble _tmp1_ = 0.0;
-#line 715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->quality_adjustment;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp1_;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3696 "ui.c"
+#line 3791 "ui.c"
 }
 
 
-static ScanOptions* user_interface_get_scan_options (UserInterface* self) {
+static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* result = NULL;
-	ScanOptions* _tmp0_;
-	ScanOptions* options;
-	const gchar* _tmp1_;
-	ScanOptions* _tmp10_;
-	ScanOptions* _tmp11_;
+	ScanOptions* options = NULL;
+	ScanOptions* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	ScanOptions* _tmp10_ = NULL;
+	ScanOptions* _tmp11_ = NULL;
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
-	ScanOptions* _tmp14_;
+	ScanOptions* _tmp14_ = NULL;
 	gint _tmp15_ = 0;
-	ScanOptions* _tmp16_;
-	gint _tmp17_ = 0;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp16_ = 0;
+	ScanOptions* _tmp17_ = NULL;
+	gint _tmp18_ = 0;
+	gint _tmp19_ = 0;
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3723 "ui.c"
-		ScanOptions* _tmp2_;
-		ScanOptions* _tmp3_;
+#line 3820 "ui.c"
+		ScanOptions* _tmp2_ = NULL;
+		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-		ScanOptions* _tmp5_;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		ScanOptions* _tmp5_ = NULL;
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3742 "ui.c"
+#line 3839 "ui.c"
 	} else {
-		ScanOptions* _tmp6_;
-		ScanOptions* _tmp7_;
+		ScanOptions* _tmp6_ = NULL;
+		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-		ScanOptions* _tmp9_;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		ScanOptions* _tmp9_ = NULL;
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 3762 "ui.c"
+#line 3859 "ui.c"
 	}
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_->brightness = _tmp15_;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = options;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = user_interface_get_contrast (self);
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_->contrast = _tmp17_;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = _tmp15_;
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_->brightness = _tmp16_;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = options;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = user_interface_get_contrast (self);
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = _tmp18_;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_->contrast = _tmp19_;
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3790 "ui.c"
+#line 3891 "ui.c"
 }
 
 
 void G_MODULE_EXPORT scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+	ScanOptions* options = NULL;
 	ScanOptions* _tmp0_ = NULL;
-	ScanOptions* options;
 	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = user_interface_get_scan_options (self);
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = user_interface_make_scan_options (self);
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_emit_by_name (self, "start-scan", _tmp2_, options);
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp2_);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp3_);
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 3819 "ui.c"
+#line 3923 "ui.c"
 }
 
 
 void G_MODULE_EXPORT stop_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 3830 "ui.c"
+#line 3934 "ui.c"
 }
 
 
 void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	gboolean _tmp0_;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->scanning;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = user_interface_get_scanning (self);
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _tmp0_;
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp1_) {
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3846 "ui.c"
+#line 3953 "ui.c"
 	} else {
-		ScanOptions* _tmp1_ = NULL;
-		ScanOptions* options;
-		ScanOptions* _tmp2_;
-		ScanType _tmp3_ = 0;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_;
-		ScanOptions* _tmp6_;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = user_interface_get_scan_options (self);
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		options = _tmp1_;
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = options;
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = user_interface_get_page_side (self);
-#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_->type = _tmp3_;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = user_interface_get_selected_device (self);
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp4_;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = options;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_signal_emit_by_name (self, "start-scan", _tmp5_, _tmp6_);
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp5_);
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		ScanOptions* options = NULL;
+		ScanOptions* _tmp2_ = NULL;
+		ScanOptions* _tmp3_ = NULL;
+		ScanType _tmp4_ = 0;
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		ScanOptions* _tmp8_ = NULL;
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = user_interface_make_scan_options (self);
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		options = _tmp2_;
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = options;
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = user_interface_get_page_side (self);
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_->type = _tmp4_;
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = user_interface_get_selected_device (self);
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = _tmp5_;
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = _tmp6_;
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = options;
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp7_);
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 3877 "ui.c"
+#line 3987 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT preferences_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	GtkDialog* _tmp0_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkDialog* _tmp0_ = NULL;
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_present ((GtkWindow*) _tmp0_);
+#line 4002 "ui.c"
+}
+
+
+void user_interface_preferences_activate_cb (UserInterface* self) {
+	GtkDialog* _tmp0_ = NULL;
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->preferences_dialog;
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 3892 "ui.c"
+#line 4014 "ui.c"
 }
 
 
 gboolean G_MODULE_EXPORT preferences_dialog_delete_event_cb (GtkWidget* widget, UserInterface* self) {
 	gboolean result = FALSE;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3906 "ui.c"
+#line 4028 "ui.c"
 }
 
 
 void G_MODULE_EXPORT preferences_dialog_response_cb (GtkWidget* widget, gint response_id, UserInterface* self) {
-	GtkDialog* _tmp0_;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkDialog* _tmp0_ = NULL;
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
-#line 3920 "ui.c"
+#line 4042 "ui.c"
+}
+
+
+static gpointer _page_ref0 (gpointer self) {
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return self ? page_ref (self) : NULL;
+#line 4049 "ui.c"
 }
 
 
 static void user_interface_update_page_menu (UserInterface* self) {
-	BookView* _tmp0_;
+	Page* page = NULL;
+	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	Page* page;
-	Page* _tmp2_;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected (_tmp0_);
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp1_;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_ == NULL) {
-#line 3941 "ui.c"
-		GtkMenuItem* _tmp3_;
-		GtkMenuItem* _tmp4_;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->page_move_left_menuitem;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->page_move_right_menuitem;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, FALSE);
-#line 3952 "ui.c"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected_page (_tmp0_);
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _page_ref0 (_tmp2_);
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page;
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_ == NULL) {
+#line 4076 "ui.c"
+		GtkMenuItem* _tmp5_ = NULL;
+		GtkMenuItem* _tmp6_ = NULL;
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = self->priv->page_move_left_menuitem;
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = self->priv->page_move_right_menuitem;
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
+#line 4087 "ui.c"
 	} else {
-		Book* _tmp5_;
-		Page* _tmp6_;
-		guint _tmp7_ = 0U;
-		guint index;
-		GtkMenuItem* _tmp8_;
-		guint _tmp9_;
-		GtkMenuItem* _tmp10_;
-		guint _tmp11_;
-		Book* _tmp12_;
+		guint index = 0U;
+		Book* _tmp7_ = NULL;
+		Page* _tmp8_ = NULL;
+		guint _tmp9_ = 0U;
+		GtkMenuItem* _tmp10_ = NULL;
+		guint _tmp11_ = 0U;
+		GtkMenuItem* _tmp12_ = NULL;
 		guint _tmp13_ = 0U;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = self->priv->book;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = page;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = book_get_page_index (_tmp5_, _tmp6_);
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		index = _tmp7_;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = self->priv->page_move_left_menuitem;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = index;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp9_ > ((guint) 0));
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = self->priv->page_move_right_menuitem;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		Book* _tmp14_ = NULL;
+		guint _tmp15_ = 0U;
+		guint _tmp16_ = 0U;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = self->priv->_book;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = page;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		index = _tmp9_;
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = self->priv->page_move_left_menuitem;
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = self->priv->book;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = book_get_n_pages (_tmp12_);
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ < (_tmp13_ - 1));
-#line 3988 "ui.c"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = self->priv->page_move_right_menuitem;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = index;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = self->priv->_book;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = book_get_n_pages (_tmp14_);
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = _tmp15_;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
+#line 4126 "ui.c"
 	}
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 3992 "ui.c"
+#line 4130 "ui.c"
 }
 
 
 static void user_interface_page_selected_cb (UserInterface* self, BookView* view, Page* page) {
-	Page* _tmp0_;
-	gchar* name;
-	Page* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	GtkBuilder* _tmp20_;
-	const gchar* _tmp21_;
-	GObject* _tmp22_ = NULL;
-	GtkRadioMenuItem* _tmp23_;
-	GtkRadioMenuItem* menuitem;
-	GtkRadioMenuItem* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_ = NULL;
-	GtkToggleToolButton* _tmp27_;
-	GtkToggleToolButton* toolbutton;
-	GtkToggleToolButton* _tmp28_;
-	Page* _tmp29_;
-	gboolean _tmp30_ = FALSE;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp0_ = NULL;
+	gchar* name = NULL;
+	gchar* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	GtkRadioMenuItem* menuitem = NULL;
+	GtkBuilder* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
+	GObject* _tmp25_ = NULL;
+	GtkRadioMenuItem* _tmp26_ = NULL;
+	GtkRadioMenuItem* _tmp27_ = NULL;
+	GtkToggleToolButton* toolbutton = NULL;
+	GtkBuilder* _tmp28_ = NULL;
+	GObject* _tmp29_ = NULL;
+	GtkToggleToolButton* _tmp30_ = NULL;
+	GtkToggleToolButton* _tmp31_ = NULL;
+	Page* _tmp32_ = NULL;
+	gboolean _tmp33_ = FALSE;
+	gboolean _tmp34_ = FALSE;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4024 "ui.c"
+#line 4165 "ui.c"
 	}
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	name = NULL;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = page;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page_has_crop (_tmp1_);
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 4038 "ui.c"
-		Page* _tmp3_;
-		gchar* _tmp4_ = NULL;
-		gchar* crop_name;
-		const gchar* _tmp5_;
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = page;
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = page_get_named_crop (_tmp3_);
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		crop_name = _tmp4_;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = crop_name;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp5_ != NULL) {
-#line 4053 "ui.c"
-			const gchar* _tmp6_;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp6_ = crop_name;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (g_strcmp0 (_tmp6_, "A4") == 0) {
-#line 4059 "ui.c"
-				gchar* _tmp7_;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = g_strdup ("a4_menuitem");
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup ("no_crop_menuitem");
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	name = _tmp1_;
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = page;
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = page_get_has_crop (_tmp2_);
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _tmp3_;
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 4183 "ui.c"
+		gchar* crop_name = NULL;
+		Page* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = page;
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = page_get_crop_name (_tmp5_);
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = _tmp6_;
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = g_strdup (_tmp7_);
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		crop_name = _tmp8_;
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = crop_name;
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp9_ != NULL) {
+#line 4204 "ui.c"
+			const gchar* _tmp10_ = NULL;
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp10_ = crop_name;
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (g_strcmp0 (_tmp10_, "A4") == 0) {
+#line 4210 "ui.c"
+				gchar* _tmp11_ = NULL;
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp11_ = g_strdup ("a4_menuitem");
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (name);
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				name = _tmp7_;
-#line 4067 "ui.c"
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				name = _tmp11_;
+#line 4218 "ui.c"
 			} else {
-				const gchar* _tmp8_;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = crop_name;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp8_, "A5") == 0) {
-#line 4074 "ui.c"
-					gchar* _tmp9_;
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp9_ = g_strdup ("a5_menuitem");
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				const gchar* _tmp12_ = NULL;
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp12_ = crop_name;
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp12_, "A5") == 0) {
+#line 4225 "ui.c"
+					gchar* _tmp13_ = NULL;
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp13_ = g_strdup ("a5_menuitem");
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (name);
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					name = _tmp9_;
-#line 4082 "ui.c"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					name = _tmp13_;
+#line 4233 "ui.c"
 				} else {
-					const gchar* _tmp10_;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp10_ = crop_name;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (g_strcmp0 (_tmp10_, "A6") == 0) {
-#line 4089 "ui.c"
-						gchar* _tmp11_;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp11_ = g_strdup ("a6_menuitem");
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					const gchar* _tmp14_ = NULL;
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp14_ = crop_name;
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (g_strcmp0 (_tmp14_, "A6") == 0) {
+#line 4240 "ui.c"
+						gchar* _tmp15_ = NULL;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp15_ = g_strdup ("a6_menuitem");
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (name);
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						name = _tmp11_;
-#line 4097 "ui.c"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						name = _tmp15_;
+#line 4248 "ui.c"
 					} else {
-						const gchar* _tmp12_;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp12_ = crop_name;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						if (g_strcmp0 (_tmp12_, "letter") == 0) {
-#line 4104 "ui.c"
-							gchar* _tmp13_;
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp13_ = g_strdup ("letter_menuitem");
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						const gchar* _tmp16_ = NULL;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp16_ = crop_name;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						if (g_strcmp0 (_tmp16_, "letter") == 0) {
+#line 4255 "ui.c"
+							gchar* _tmp17_ = NULL;
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp17_ = g_strdup ("letter_menuitem");
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							name = _tmp13_;
-#line 4112 "ui.c"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							name = _tmp17_;
+#line 4263 "ui.c"
 						} else {
-							const gchar* _tmp14_;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp14_ = crop_name;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (g_strcmp0 (_tmp14_, "legal") == 0) {
-#line 4119 "ui.c"
-								gchar* _tmp15_;
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp15_ = g_strdup ("legal_menuitem");
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							const gchar* _tmp18_ = NULL;
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp18_ = crop_name;
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (g_strcmp0 (_tmp18_, "legal") == 0) {
+#line 4270 "ui.c"
+								gchar* _tmp19_ = NULL;
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp19_ = g_strdup ("legal_menuitem");
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								name = _tmp15_;
-#line 4127 "ui.c"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								name = _tmp19_;
+#line 4278 "ui.c"
 							} else {
-								const gchar* _tmp16_;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp16_ = crop_name;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								if (g_strcmp0 (_tmp16_, "4x6") == 0) {
-#line 4134 "ui.c"
-									gchar* _tmp17_;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									_tmp17_ = g_strdup ("4x6_menuitem");
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								const gchar* _tmp20_ = NULL;
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp20_ = crop_name;
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								if (g_strcmp0 (_tmp20_, "4x6") == 0) {
+#line 4285 "ui.c"
+									gchar* _tmp21_ = NULL;
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+									_tmp21_ = g_strdup ("4x6_menuitem");
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_g_free0 (name);
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									name = _tmp17_;
-#line 4142 "ui.c"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+									name = _tmp21_;
+#line 4293 "ui.c"
 								}
 							}
 						}
@@ -4146,120 +4297,116 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 				}
 			}
 		} else {
-			gchar* _tmp18_;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = g_strdup ("custom_crop_menuitem");
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gchar* _tmp22_ = NULL;
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp22_ = g_strdup ("custom_crop_menuitem");
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (name);
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			name = _tmp18_;
-#line 4157 "ui.c"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			name = _tmp22_;
+#line 4308 "ui.c"
 		}
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4161 "ui.c"
-	} else {
-		gchar* _tmp19_;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = g_strdup ("no_crop_menuitem");
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (name);
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		name = _tmp19_;
-#line 4170 "ui.c"
+#line 4312 "ui.c"
 	}
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = self->priv->builder;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = name;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = gtk_builder_get_object (_tmp20_, _tmp21_);
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	menuitem = _tmp23_;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = menuitem;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp24_, TRUE);
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = self->priv->builder;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "crop_toolbutton");
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton));
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	toolbutton = _tmp27_;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = toolbutton;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = page;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = page_has_crop (_tmp29_);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_toggle_tool_button_set_active (_tmp28_, _tmp30_);
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = self->priv->builder;
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = name;
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = gtk_builder_get_object (_tmp23_, _tmp24_);
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	menuitem = _tmp26_;
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = menuitem;
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp27_, TRUE);
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = self->priv->builder;
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = gtk_builder_get_object (_tmp28_, "crop_toolbutton");
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton));
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	toolbutton = _tmp30_;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = toolbutton;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = page;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = page_get_has_crop (_tmp32_);
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = _tmp33_;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_toggle_tool_button_set_active (_tmp31_, _tmp34_);
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (toolbutton);
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (name);
-#line 4210 "ui.c"
+#line 4354 "ui.c"
 }
 
 
 static void user_interface_show_page_cb (UserInterface* self, BookView* view, Page* page) {
+	gchar* path = NULL;
 	gchar* _tmp0_ = NULL;
-	gchar* path;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
+	const gchar* _tmp1_ = NULL;
+	GFile* file = NULL;
+	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-	GFile* file;
 	GError * _inner_error_ = NULL;
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4240 "ui.c"
+#line 4384 "ui.c"
 	}
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4248 "ui.c"
+#line 4392 "ui.c"
 	{
-		Page* _tmp4_;
+		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-		GFile* _tmp6_;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gint _tmp6_ = 0;
+		GFile* _tmp7_ = NULL;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = file;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_save (_tmp4_, "tiff", _tmp5_, _tmp6_, &_inner_error_);
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = _tmp5_;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = file;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 4263 "ui.c"
+#line 4410 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -4267,72 +4414,72 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	__catch17_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp7_ = NULL;
-		GError* _tmp8_;
-		const gchar* _tmp9_;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp8_ = NULL;
+		GError* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _ ("Unable to save image for preview");
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = e;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = _tmp8_->message;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp7_, _tmp9_);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = _ ("Unable to save image for preview");
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = e;
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = _tmp9_->message;
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4294 "ui.c"
+#line 4441 "ui.c"
 	}
 	__finally17:
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4309 "ui.c"
+#line 4456 "ui.c"
 	}
 	{
-		GtkWindow* _tmp10_;
-		GdkScreen* _tmp11_ = NULL;
-		GFile* _tmp12_;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_;
-		guint32 _tmp15_ = 0U;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = self->priv->window;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = gtk_window_get_screen (_tmp10_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = file;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = g_file_get_uri (_tmp12_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = _tmp13_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = gtk_get_current_event_time ();
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_show_uri (_tmp11_, _tmp14_, _tmp15_, &_inner_error_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp14_);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkApplicationWindow* _tmp11_ = NULL;
+		GdkScreen* _tmp12_ = NULL;
+		GFile* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		gchar* _tmp15_ = NULL;
+		guint32 _tmp16_ = 0U;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = self->priv->window;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = gtk_window_get_screen ((GtkWindow*) _tmp11_);
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = file;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = g_file_get_uri (_tmp13_);
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = _tmp14_;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = gtk_get_current_event_time ();
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp15_);
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 4336 "ui.c"
+#line 4483 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4340,974 +4487,1068 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	__catch18_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp16_ = NULL;
-		GError* _tmp17_;
-		const gchar* _tmp18_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp17_ = NULL;
+		GError* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = _ ("Unable to open image preview application");
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = e;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = _tmp17_->message;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp16_, _tmp18_);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = _ ("Unable to open image preview application");
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp18_ = e;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp19_ = _tmp18_->message;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4361 "ui.c"
+#line 4508 "ui.c"
 	}
 	__finally18:
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4376 "ui.c"
+#line 4523 "ui.c"
 	}
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4382 "ui.c"
+#line 4529 "ui.c"
 }
 
 
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
-	GtkBuilder* _tmp0_;
+	GtkMenu* menu = NULL;
+	GtkBuilder* _tmp0_ = NULL;
 	GObject* _tmp1_ = NULL;
-	GtkMenu* _tmp2_;
-	GtkMenu* menu;
+	GtkMenu* _tmp2_ = NULL;
 	guint32 _tmp3_ = 0U;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->builder;
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "page_menu");
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_MENU, GtkMenu));
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menu = _tmp2_;
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_get_current_event_time ();
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, (guint) 3, _tmp3_);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menu);
-#line 4410 "ui.c"
+#line 4557 "ui.c"
 }
 
 
 void G_MODULE_EXPORT rotate_left_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	gboolean _tmp0_;
-	BookView* _tmp1_;
+	gboolean _tmp0_ = FALSE;
+	Page* page = NULL;
+	BookView* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-	Page* page;
-	Page* _tmp3_;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4430 "ui.c"
+#line 4579 "ui.c"
 	}
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_view_get_selected (_tmp1_);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp2_;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_ != NULL) {
-#line 4442 "ui.c"
-		Page* _tmp4_;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = page;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_rotate_left (_tmp4_);
-#line 4448 "ui.c"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = book_view_get_selected_page (_tmp1_);
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _page_ref0 (_tmp3_);
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp4_;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = page;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp5_ != NULL) {
+#line 4595 "ui.c"
+		Page* _tmp6_ = NULL;
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = page;
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_rotate_left (_tmp6_);
+#line 4601 "ui.c"
 	}
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4452 "ui.c"
+#line 4605 "ui.c"
 }
 
 
 void G_MODULE_EXPORT rotate_right_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	gboolean _tmp0_;
-	BookView* _tmp1_;
+	gboolean _tmp0_ = FALSE;
+	Page* page = NULL;
+	BookView* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-	Page* page;
-	Page* _tmp3_;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4472 "ui.c"
+#line 4627 "ui.c"
 	}
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = book_view_get_selected (_tmp1_);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp2_;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_ != NULL) {
-#line 4484 "ui.c"
-		Page* _tmp4_;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = page;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_rotate_right (_tmp4_);
-#line 4490 "ui.c"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = book_view_get_selected_page (_tmp1_);
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _page_ref0 (_tmp3_);
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp4_;
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = page;
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp5_ != NULL) {
+#line 4643 "ui.c"
+		Page* _tmp6_ = NULL;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = page;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_rotate_right (_tmp6_);
+#line 4649 "ui.c"
 	}
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4494 "ui.c"
+#line 4653 "ui.c"
 }
 
 
 static void user_interface_set_crop (UserInterface* self, const gchar* crop_name) {
-	GtkMenuItem* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_;
-	BookView* _tmp3_;
+	GtkMenuItem* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	Page* page = NULL;
+	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-	Page* page;
-	Page* _tmp5_;
-	const gchar* _tmp6_;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp5_ = NULL;
+	Page* _tmp6_ = NULL;
+	Page* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4521 "ui.c"
+#line 4682 "ui.c"
 	}
-#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book_view_get_selected (_tmp3_);
-#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp4_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_ == NULL) {
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_page_unref0 (page);
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 4537 "ui.c"
-	}
-#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = crop_name;
-#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_ == NULL) {
-#line 4543 "ui.c"
-		Page* _tmp7_;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = page;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_set_no_crop (_tmp7_);
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = book_view_get_selected_page (_tmp3_);
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _tmp4_;
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = _page_ref0 (_tmp5_);
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp6_;
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = page;
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp7_ == NULL) {
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:971: Trying to set crop but no selected page");
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4553 "ui.c"
+#line 4704 "ui.c"
+	}
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = crop_name;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp8_ == NULL) {
+#line 4710 "ui.c"
+		Page* _tmp9_ = NULL;
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = page;
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_set_no_crop (_tmp9_);
+#line 4716 "ui.c"
 	} else {
-		const gchar* _tmp8_;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = crop_name;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (g_strcmp0 (_tmp8_, "custom") == 0) {
-#line 4560 "ui.c"
-			Page* _tmp9_;
-			gint _tmp10_ = 0;
-			gint width;
-			Page* _tmp11_;
+		const gchar* _tmp10_ = NULL;
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = crop_name;
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (g_strcmp0 (_tmp10_, "custom") == 0) {
+#line 4723 "ui.c"
+			gint width = 0;
+			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
-			gint height;
-			gint _tmp13_;
-			gint crop_width;
-			gint _tmp14_;
-			gint crop_height;
-			Page* _tmp15_;
-			gint _tmp16_;
-			gint _tmp17_;
-			Page* _tmp18_;
-			gint _tmp19_;
-			gint _tmp20_;
-			gint _tmp21_;
-			gint _tmp22_;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp9_ = page;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp10_ = page_get_width (_tmp9_);
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			width = _tmp10_;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gint _tmp13_ = 0;
+			gint height = 0;
+			Page* _tmp14_ = NULL;
+			gint _tmp15_ = 0;
+			gint _tmp16_ = 0;
+			gint crop_width = 0;
+			gint _tmp17_ = 0;
+			gint crop_height = 0;
+			gint _tmp18_ = 0;
+			Page* _tmp19_ = NULL;
+			gint _tmp20_ = 0;
+			gint _tmp21_ = 0;
+			Page* _tmp22_ = NULL;
+			gint _tmp23_ = 0;
+			gint _tmp24_ = 0;
+			gint _tmp25_ = 0;
+			gint _tmp26_ = 0;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp12_ = page_get_height (_tmp11_);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			height = _tmp12_;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp13_ = width;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			crop_width = (gint) ((_tmp13_ * 0.8) + 0.5);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp14_ = height;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			crop_height = (gint) ((_tmp14_ * 0.8) + 0.5);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp15_ = page;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp16_ = crop_width;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp17_ = crop_height;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_set_custom_crop (_tmp15_, _tmp16_, _tmp17_);
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = page;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp19_ = width;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp12_ = page_get_width (_tmp11_);
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp13_ = _tmp12_;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			width = _tmp13_;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp14_ = page;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp15_ = page_get_height (_tmp14_);
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp16_ = _tmp15_;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			height = _tmp16_;
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp17_ = width;
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp18_ = height;
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp19_ = page;
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp21_ = height;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp22_ = crop_height;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_move_crop (_tmp18_, (_tmp19_ - _tmp20_) / 2, (_tmp21_ - _tmp22_) / 2);
-#line 4619 "ui.c"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp21_ = crop_height;
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp22_ = page;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp23_ = width;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp24_ = crop_width;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp25_ = height;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp26_ = crop_height;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
+#line 4788 "ui.c"
 		} else {
-			Page* _tmp23_;
-			const gchar* _tmp24_;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp23_ = page;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp24_ = crop_name;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_set_named_crop (_tmp23_, _tmp24_);
-#line 4629 "ui.c"
+			Page* _tmp27_ = NULL;
+			const gchar* _tmp28_ = NULL;
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp27_ = page;
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp28_ = crop_name;
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			page_set_named_crop (_tmp27_, _tmp28_);
+#line 4798 "ui.c"
 		}
 	}
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4634 "ui.c"
+#line 4803 "ui.c"
 }
 
 
 void G_MODULE_EXPORT no_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 4653 "ui.c"
+#line 4822 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT custom_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 4673 "ui.c"
+#line 4842 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT crop_toolbutton_toggled_cb (GtkToggleToolButton* widget, UserInterface* self) {
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	GtkRadioMenuItem* menuitem = NULL;
-	GtkToggleToolButton* _tmp1_;
+	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	GtkRadioMenuItem* _tmp9_;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkRadioMenuItem* _tmp9_ = NULL;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4694 "ui.c"
+#line 4863 "ui.c"
 	}
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 4702 "ui.c"
-		GtkBuilder* _tmp3_;
+#line 4871 "ui.c"
+		GtkBuilder* _tmp3_ = NULL;
 		GObject* _tmp4_ = NULL;
-		GtkRadioMenuItem* _tmp5_;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkRadioMenuItem* _tmp5_ = NULL;
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->builder;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = gtk_builder_get_object (_tmp3_, "custom_crop_menuitem");
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menuitem);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menuitem = _tmp5_;
-#line 4716 "ui.c"
+#line 4885 "ui.c"
 	} else {
-		GtkBuilder* _tmp6_;
+		GtkBuilder* _tmp6_ = NULL;
 		GObject* _tmp7_ = NULL;
-		GtkRadioMenuItem* _tmp8_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkRadioMenuItem* _tmp8_ = NULL;
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->builder;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = gtk_builder_get_object (_tmp6_, "no_crop_menuitem");
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menuitem);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menuitem = _tmp8_;
-#line 4731 "ui.c"
+#line 4900 "ui.c"
 	}
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = menuitem;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4739 "ui.c"
+#line 4908 "ui.c"
 }
 
 
 void G_MODULE_EXPORT four_by_six_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 4758 "ui.c"
+#line 4927 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT legal_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 4778 "ui.c"
+#line 4947 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT letter_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 4798 "ui.c"
+#line 4967 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT a6_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 4818 "ui.c"
+#line 4987 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT a5_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 4838 "ui.c"
+#line 5007 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT a4_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
-	GtkCheckMenuItem* _tmp0_;
+	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 4858 "ui.c"
+#line 5027 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT crop_rotate_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-	BookView* _tmp0_;
+	Page* page = NULL;
+	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	Page* page;
-	Page* _tmp2_;
-	Page* _tmp3_;
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected (_tmp0_);
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp1_;
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_ == NULL) {
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected_page (_tmp0_);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _page_ref0 (_tmp2_);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_ == NULL) {
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4887 "ui.c"
+#line 5062 "ui.c"
 	}
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page_rotate_crop (_tmp3_);
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = page;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page_rotate_crop (_tmp5_);
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4895 "ui.c"
+#line 5070 "ui.c"
 }
 
 
 void G_MODULE_EXPORT page_move_left_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-	BookView* _tmp0_;
+	Page* page = NULL;
+	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	Page* page;
-	Book* _tmp2_;
-	Page* _tmp3_;
-	guint _tmp4_ = 0U;
-	guint index;
-	guint _tmp5_;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	guint index = 0U;
+	Book* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+	guint _tmp6_ = 0U;
+	guint _tmp7_ = 0U;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected (_tmp0_);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp1_;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->book;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book_get_page_index (_tmp2_, _tmp3_);
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp4_;
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = index;
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_ > ((guint) 0)) {
-#line 4930 "ui.c"
-		Book* _tmp6_;
-		Page* _tmp7_;
-		guint _tmp8_;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = self->priv->book;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = page;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = index;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_move_page (_tmp6_, _tmp7_, _tmp8_ - 1);
-#line 4942 "ui.c"
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected_page (_tmp0_);
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _page_ref0 (_tmp2_);
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->_book;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = page;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = _tmp6_;
+#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = index;
+#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp7_ > ((guint) 0)) {
+#line 5111 "ui.c"
+		Book* _tmp8_ = NULL;
+		Page* _tmp9_ = NULL;
+		guint _tmp10_ = 0U;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = self->priv->_book;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = page;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = index;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
+#line 5123 "ui.c"
 	}
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4948 "ui.c"
+#line 5129 "ui.c"
 }
 
 
 void G_MODULE_EXPORT page_move_right_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-	BookView* _tmp0_;
+	Page* page = NULL;
+	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	Page* page;
-	Book* _tmp2_;
-	Page* _tmp3_;
-	guint _tmp4_ = 0U;
-	guint index;
-	guint _tmp5_;
-	Book* _tmp6_;
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	guint index = 0U;
+	Book* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Book* _tmp8_ = NULL;
+	guint _tmp9_ = 0U;
+	guint _tmp10_ = 0U;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected (_tmp0_);
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp1_;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->book;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book_get_page_index (_tmp2_, _tmp3_);
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp4_;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = index;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->book;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = book_get_n_pages (_tmp6_);
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_ < (_tmp7_ - 1)) {
-#line 4989 "ui.c"
-		Book* _tmp8_;
-		Page* _tmp9_;
-		Book* _tmp10_;
-		Page* _tmp11_;
-		guint _tmp12_ = 0U;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = self->priv->book;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = page;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = self->priv->book;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = page;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = book_get_page_index (_tmp10_, _tmp11_);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_move_page (_tmp8_, _tmp9_, _tmp12_ + 1);
-#line 5007 "ui.c"
-	}
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected_page (_tmp0_);
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _page_ref0 (_tmp2_);
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->_book;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = page;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = _tmp6_;
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = index;
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = self->priv->_book;
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = book_get_n_pages (_tmp8_);
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = _tmp9_;
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp7_ < (_tmp10_ - 1)) {
+#line 5179 "ui.c"
+		Book* _tmp11_ = NULL;
+		Page* _tmp12_ = NULL;
+		Book* _tmp13_ = NULL;
+		Page* _tmp14_ = NULL;
+		guint _tmp15_ = 0U;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = self->priv->_book;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = page;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = self->priv->_book;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = page;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
+#line 5197 "ui.c"
+	}
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5013 "ui.c"
+#line 5203 "ui.c"
 }
 
 
 void G_MODULE_EXPORT page_delete_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-	BookView* _tmp0_;
+	BookView* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
-	Book* _tmp2_;
-	BookView* _tmp3_;
+	Book* _tmp2_ = NULL;
+	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-	Page* _tmp5_;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp5_ = NULL;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book_view_get_selected (_tmp3_);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = book_view_get_selected_page (_tmp3_);
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_page_unref0 (_tmp5_);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (_tmp2_);
-#line 5046 "ui.c"
+#line 5232 "ui.c"
 }
 
 
 void G_MODULE_EXPORT save_file_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_document (self, FALSE);
+#line 5243 "ui.c"
+}
+
+
+void user_interface_save_document_activate_cb (UserInterface* self) {
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 5057 "ui.c"
+#line 5252 "ui.c"
 }
 
 
 void G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	BookView* _tmp0_;
+	Page* page = NULL;
+	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	Page* page;
-	Page* _tmp2_;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	Page* _tmp4_ = NULL;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected (_tmp0_);
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp1_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_ != NULL) {
-#line 5080 "ui.c"
-		Page* _tmp3_;
-		GtkWindow* _tmp4_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = page;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->window;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_copy_to_clipboard (_tmp3_, _tmp4_);
-#line 5089 "ui.c"
-	}
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected_page (_tmp0_);
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _page_ref0 (_tmp2_);
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_ != NULL) {
+#line 5281 "ui.c"
+		Page* _tmp5_ = NULL;
+		GtkApplicationWindow* _tmp6_ = NULL;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = page;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = self->priv->window;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_copy_to_clipboard (_tmp5_, (GtkWindow*) _tmp6_);
+#line 5290 "ui.c"
+	}
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5093 "ui.c"
+#line 5294 "ui.c"
 }
 
 
 void G_MODULE_EXPORT save_as_file_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 5104 "ui.c"
+#line 5305 "ui.c"
+}
+
+
+void user_interface_save_as_document_activate_cb (UserInterface* self) {
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_document (self, TRUE);
+#line 5314 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 5111 "ui.c"
+#line 5321 "ui.c"
 }
 
 
 static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* operation, GtkPrintContext* print_context, gint page_number) {
-	GtkPrintContext* _tmp0_;
+	cairo_t* context = NULL;
+	GtkPrintContext* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-	cairo_t* _tmp2_;
-	cairo_t* context;
-	Book* _tmp3_;
-	gint _tmp4_;
+	cairo_t* _tmp2_ = NULL;
+	Page* page = NULL;
+	Book* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
 	Page* _tmp5_ = NULL;
-	Page* page;
-	gboolean is_landscape;
-	GtkPrintContext* _tmp6_;
+	gboolean is_landscape = FALSE;
+	GtkPrintContext* _tmp6_ = NULL;
 	gdouble _tmp7_ = 0.0;
-	GtkPrintContext* _tmp8_;
+	GtkPrintContext* _tmp8_ = NULL;
 	gdouble _tmp9_ = 0.0;
-	Page* _tmp10_;
+	Page* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_;
-	cairo_t* _tmp17_;
-	GtkPrintContext* _tmp18_;
-	gdouble _tmp19_ = 0.0;
-	Page* _tmp20_;
-	gint _tmp21_ = 0;
-	GtkPrintContext* _tmp22_;
-	gdouble _tmp23_ = 0.0;
-	Page* _tmp24_;
-	gint _tmp25_ = 0;
-	Page* _tmp26_;
-	GdkPixbuf* _tmp27_ = NULL;
-	GdkPixbuf* image;
-	cairo_t* _tmp28_;
-	cairo_t* _tmp29_;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp12_ = FALSE;
+	gboolean _tmp13_ = FALSE;
+	cairo_t* _tmp18_ = NULL;
+	GtkPrintContext* _tmp19_ = NULL;
+	gdouble _tmp20_ = 0.0;
+	Page* _tmp21_ = NULL;
+	gint _tmp22_ = 0;
+	gint _tmp23_ = 0;
+	GtkPrintContext* _tmp24_ = NULL;
+	gdouble _tmp25_ = 0.0;
+	Page* _tmp26_ = NULL;
+	gint _tmp27_ = 0;
+	gint _tmp28_ = 0;
+	GdkPixbuf* image = NULL;
+	Page* _tmp29_ = NULL;
+	GdkPixbuf* _tmp30_ = NULL;
+	cairo_t* _tmp31_ = NULL;
+	cairo_t* _tmp32_ = NULL;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->book;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->_book;
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 5182 "ui.c"
+#line 5395 "ui.c"
 	}
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = page_is_landscape (_tmp10_);
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = is_landscape;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp11_ != _tmp12_) {
-#line 5192 "ui.c"
-		cairo_t* _tmp13_;
-		GtkPrintContext* _tmp14_;
-		gdouble _tmp15_ = 0.0;
-		cairo_t* _tmp16_;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = context;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = print_context;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = gtk_print_context_get_width (_tmp14_);
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		cairo_translate (_tmp13_, _tmp15_, (gdouble) 0);
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = context;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		cairo_rotate (_tmp16_, G_PI_2);
-#line 5209 "ui.c"
-	}
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = context;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = print_context;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = gtk_print_context_get_dpi_x (_tmp18_);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = page;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = page_get_dpi (_tmp20_);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = print_context;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = gtk_print_context_get_dpi_y (_tmp22_);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = page;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = page_get_dpi (_tmp24_);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_scale (_tmp17_, _tmp19_ / _tmp21_, _tmp23_ / _tmp25_);
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = page_get_is_landscape (_tmp10_);
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = _tmp11_;
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = is_landscape;
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp12_ != _tmp13_) {
+#line 5407 "ui.c"
+		cairo_t* _tmp14_ = NULL;
+		GtkPrintContext* _tmp15_ = NULL;
+		gdouble _tmp16_ = 0.0;
+		cairo_t* _tmp17_ = NULL;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = context;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = print_context;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = gtk_print_context_get_width (_tmp15_);
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = context;
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		cairo_rotate (_tmp17_, G_PI_2);
+#line 5424 "ui.c"
+	}
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = context;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = print_context;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = page;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = page_get_dpi (_tmp21_);
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = _tmp22_;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = print_context;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = page_get_image (_tmp26_, TRUE);
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	image = _tmp27_;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = context;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gdk_cairo_set_source_pixbuf (_tmp28_, image, (gdouble) 0, (gdouble) 0);
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = context;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_paint (_tmp29_);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = page_get_dpi (_tmp26_);
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = _tmp27_;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = page;
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp30_ = page_get_image (_tmp29_, TRUE);
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	image = _tmp30_;
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = context;
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = context;
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_paint (_tmp32_);
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 5251 "ui.c"
+#line 5470 "ui.c"
 }
 
 
 void G_MODULE_EXPORT email_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp2_ = 0;
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->document_hint;
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_quality (self);
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
+#line 5490 "ui.c"
+}
+
+
+void user_interface_email_document_activate_cb (UserInterface* self) {
+	const gchar* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_emit_by_name (self, "email", _tmp0_, _tmp1_);
-#line 5268 "ui.c"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
+#line 5508 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page (self, _sender, context, page_nr);
-#line 5275 "ui.c"
+#line 5515 "ui.c"
 }
 
 
-void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-	GtkPrintOperation* _tmp0_;
-	GtkPrintOperation* print;
-	Book* _tmp1_;
+static void user_interface_print_document (UserInterface* self) {
+	GtkPrintOperation* print = NULL;
+	GtkPrintOperation* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-	guint _tmp6_ = 0U;
+	guint _tmp3_ = 0U;
+	guint _tmp7_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->book;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = self->priv->_book;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_print_operation_set_n_pages (print, (gint) _tmp2_);
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_print_operation_set_n_pages (print, (gint) _tmp3_);
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 5302 "ui.c"
+#line 5543 "ui.c"
 	{
-		GtkWindow* _tmp3_;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->window;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, _tmp3_, &_inner_error_);
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkApplicationWindow* _tmp4_ = NULL;
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = self->priv->window;
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) _tmp4_, &_inner_error_);
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 5311 "ui.c"
+#line 5552 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -5315,67 +5556,85 @@ void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface*
 	__catch19_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GError* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = e;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _tmp4_->message;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1103: Error printing: %s", _tmp5_);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = e;
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = _tmp5_->message;
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1175: Error printing: %s", _tmp6_);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 5333 "ui.c"
+#line 5574 "ui.c"
 	}
 	__finally19:
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5346 "ui.c"
+#line 5587 "ui.c"
 	}
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("draw-page", GTK_TYPE_PRINT_OPERATION, &_tmp6_, NULL, FALSE);
-#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("draw-page", GTK_TYPE_PRINT_OPERATION, &_tmp7_, NULL, FALSE);
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 5354 "ui.c"
+#line 5595 "ui.c"
 }
 
 
-void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-	GError * _inner_error_ = NULL;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 5364 "ui.c"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_print_document (self);
+#line 5606 "ui.c"
+}
+
+
+void user_interface_print_document_activate_cb (UserInterface* self) {
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_print_document (self);
+#line 5615 "ui.c"
+}
+
+
+static void user_interface_show_help (UserInterface* self) {
+	GError * _inner_error_ = NULL;
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 5623 "ui.c"
 	{
-		GtkWindow* _tmp0_;
+		GtkApplicationWindow* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->window;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = gtk_window_get_screen (_tmp0_);
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = gtk_window_get_screen ((GtkWindow*) _tmp0_);
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 5379 "ui.c"
+#line 5638 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -5384,72 +5643,90 @@ void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, User
 	{
 		GError* e = NULL;
 		const gchar* _tmp3_ = NULL;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 5404 "ui.c"
+#line 5663 "ui.c"
 	}
 	__finally20:
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5415 "ui.c"
+#line 5674 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-	gchar* _tmp0_;
+void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (widget != NULL);
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_show_help (self);
+#line 5686 "ui.c"
+}
+
+
+void user_interface_help_contents_activate_cb (UserInterface* self) {
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_show_help (self);
+#line 5695 "ui.c"
+}
+
+
+static void user_interface_show_about (UserInterface* self) {
+	gchar** authors = NULL;
+	gchar* _tmp0_ = NULL;
 	gchar** _tmp1_ = NULL;
-	gchar** authors;
-	gint authors_length1;
-	gint _authors_size_;
+	gint authors_length1 = 0;
+	gint _authors_size_ = 0;
+	gchar* license = NULL;
 	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_;
-	gchar* license;
+	gchar* _tmp3_ = NULL;
+	gchar* title = NULL;
 	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_;
-	gchar* title;
+	gchar* _tmp5_ = NULL;
+	gchar* description = NULL;
 	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_;
-	gchar* description;
-	GtkWindow* _tmp8_;
+	gchar* _tmp7_ = NULL;
+	GtkApplicationWindow* _tmp8_ = NULL;
 	const gchar* _tmp9_ = NULL;
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -5462,37 +5739,57 @@ void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterfac
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->window;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = _ ("translator-credits");
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_show_about_dialog (_tmp8_, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp9_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_show_about_dialog ((GtkWindow*) _tmp8_, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp9_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 5485 "ui.c"
+#line 5762 "ui.c"
+}
+
+
+void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (widget != NULL);
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_show_about (self);
+#line 5773 "ui.c"
+}
+
+
+void user_interface_about_activate_cb (UserInterface* self) {
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_show_about (self);
+#line 5782 "ui.c"
 }
 
 
@@ -5501,2625 +5798,3637 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	gchar* _tmp3_ = NULL;
-	gchar* device;
-	gint paper_width;
-	gint paper_height;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	const gchar* _tmp6_;
-	GSettings* _tmp9_;
-	const gchar* _tmp10_;
-	GSettings* _tmp11_;
-	gint _tmp12_ = 0;
-	GSettings* _tmp13_;
-	gint _tmp14_ = 0;
-	GSettings* _tmp15_;
-	ScanType _tmp16_ = 0;
-	GSettings* _tmp17_;
-	gint _tmp18_;
-	GSettings* _tmp19_;
-	gint _tmp20_;
-	GSettings* _tmp21_;
-	gint _tmp22_ = 0;
-	GSettings* _tmp23_;
-	gint _tmp24_ = 0;
-	GSettings* _tmp25_;
-	gint _tmp26_ = 0;
-	GSettings* _tmp27_;
-	gint _tmp28_;
-	GSettings* _tmp29_;
-	gint _tmp30_;
-	GSettings* _tmp31_;
-	gboolean _tmp32_;
-	GSettings* _tmp33_;
-	ScanDirection _tmp34_;
-	GSettings* _tmp35_;
-	gint _tmp36_;
-	GSettings* _tmp37_;
-	gint _tmp38_;
-	GSettings* _tmp39_;
-	gint _tmp40_;
-	GtkWindow* _tmp41_;
-	AutosaveManager* _tmp42_;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkApplicationWindow* _tmp3_ = NULL;
+	guint _tmp4_ = 0U;
+	AutosaveManager* _tmp5_ = NULL;
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5549 "ui.c"
-	}
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = user_interface_get_selected_device (self);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	device = _tmp3_;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = 0;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = 0;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_get_paper_size (self, &_tmp4_, &_tmp5_);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp4_;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp5_;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = device;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_ != NULL) {
-#line 5569 "ui.c"
-		GSettings* _tmp7_;
-		const gchar* _tmp8_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = self->priv->settings;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = device;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_settings_set_string (_tmp7_, "selected-device", _tmp8_);
-#line 5578 "ui.c"
+#line 5808 "ui.c"
 	}
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->settings;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = self->priv->document_hint;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_string (_tmp9_, "document-type", _tmp10_);
-#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = self->priv->settings;
-#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = user_interface_get_text_dpi (self);
-#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp11_, "text-dpi", _tmp12_);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->settings;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = user_interface_get_photo_dpi (self);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp13_, "photo-dpi", _tmp14_);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->settings;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = user_interface_get_page_side (self);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_enum (_tmp15_, "page-side", (gint) _tmp16_);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->settings;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = paper_width;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp17_, "paper-width", _tmp18_);
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = self->priv->settings;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = paper_height;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp19_, "paper-height", _tmp20_);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = self->priv->settings;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = user_interface_get_brightness (self);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp21_, "brightness", _tmp22_);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = self->priv->settings;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = user_interface_get_contrast (self);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp23_, "contrast", _tmp24_);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = self->priv->settings;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = user_interface_get_quality (self);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp25_, "jpeg-quality", _tmp26_);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = self->priv->settings;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = self->priv->window_width;
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp27_, "window-width", _tmp28_);
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = self->priv->settings;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = self->priv->window_height;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp29_, "window-height", _tmp30_);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = self->priv->settings;
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = self->priv->window_is_maximized;
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_boolean (_tmp31_, "window-is-maximized", _tmp32_);
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = self->priv->settings;
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = self->priv->default_page_scan_direction;
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_enum (_tmp33_, "scan-direction", (gint) _tmp34_);
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = self->priv->settings;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = self->priv->default_page_width;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp35_, "page-width", _tmp36_);
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = self->priv->settings;
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = self->priv->default_page_height;
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp37_, "page-height", _tmp38_);
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = self->priv->settings;
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = self->priv->default_page_dpi;
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_int (_tmp39_, "page-dpi", _tmp40_);
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = self->priv->window;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp41_);
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = self->priv->autosave_manager;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp42_ != NULL) {
-#line 5684 "ui.c"
-		AutosaveManager* _tmp43_;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp43_ = self->priv->autosave_manager;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		autosave_manager_cleanup (_tmp43_);
-#line 5690 "ui.c"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->window;
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp3_);
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->save_state_timeout;
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_ != ((guint) 0)) {
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_save_state (self, TRUE);
+#line 5820 "ui.c"
 	}
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = self->priv->autosave_manager;
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_cleanup (_tmp5_);
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (device);
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5698 "ui.c"
+#line 5830 "ui.c"
 }
 
 
 void G_MODULE_EXPORT quit_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 5709 "ui.c"
+#line 5841 "ui.c"
+}
+
+
+void user_interface_quit_activate_cb (UserInterface* self) {
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_on_quit (self);
+#line 5850 "ui.c"
 }
 
 
 gboolean G_MODULE_EXPORT simple_scan_window_configure_event_cb (GtkWidget* widget, GdkEventConfigure* event, UserInterface* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp0_ = FALSE;
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 5726 "ui.c"
-		GdkEventConfigure _tmp1_;
-		gint _tmp2_;
-		GdkEventConfigure _tmp3_;
-		gint _tmp4_;
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 5867 "ui.c"
+		GdkEventConfigure _tmp1_ = {0};
+		gint _tmp2_ = 0;
+		GdkEventConfigure _tmp3_ = {0};
+		gint _tmp4_ = 0;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = *event;
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = _tmp1_.width;
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = *event;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_.height;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
-#line 5743 "ui.c"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_save_state (self, FALSE);
+#line 5886 "ui.c"
 	}
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5749 "ui.c"
+#line 5892 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
-	gint _tmp0_;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp0_ = 0;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == 1) {
-#line 5763 "ui.c"
-		GtkComboBox* _tmp1_;
-		GtkDialog* _tmp2_;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 5906 "ui.c"
+		GtkComboBox* _tmp1_ = NULL;
+		GtkDialog* _tmp2_ = NULL;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->preferences_dialog;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_present ((GtkWindow*) _tmp2_);
-#line 5774 "ui.c"
+#line 5917 "ui.c"
 	} else {
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->have_error = FALSE;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_title);
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_title = NULL;
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_text);
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_text = NULL;
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_update_info_bar (self);
-#line 5788 "ui.c"
+#line 5931 "ui.c"
 	}
 }
 
 
 gboolean G_MODULE_EXPORT simple_scan_window_window_state_event_cb (GtkWidget* widget, GdkEventWindowState* event, UserInterface* self) {
 	gboolean result = FALSE;
-	GdkEventWindowState _tmp0_;
-	GdkWindowState _tmp1_;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GdkEventWindowState _tmp0_ = {0};
+	GdkWindowState _tmp1_ = 0;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = *event;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_.changed_mask;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 5809 "ui.c"
-		GdkEventWindowState _tmp2_;
-		GdkWindowState _tmp3_;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 5952 "ui.c"
+		GdkEventWindowState _tmp2_ = {0};
+		GdkWindowState _tmp3_ = 0;
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = *event;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_.new_window_state;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 5818 "ui.c"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_save_state (self, FALSE);
+#line 5963 "ui.c"
 	}
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5824 "ui.c"
+#line 5969 "ui.c"
 }
 
 
 gboolean G_MODULE_EXPORT window_delete_event_cb (GtkWidget* widget, GdkEvent* event, UserInterface* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5843 "ui.c"
+#line 5988 "ui.c"
 }
 
 
 static void user_interface_page_size_changed_cb (UserInterface* self, Page* page) {
-	Page* _tmp0_;
+	Page* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-	Page* _tmp2_;
-	gint _tmp3_ = 0;
-	Page* _tmp4_;
+	gint _tmp2_ = 0;
+	Page* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
+	gint _tmp8_ = 0;
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_width = _tmp1_;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page_get_height (_tmp2_);
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_height = _tmp3_;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = page;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page_get_dpi (_tmp4_);
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_dpi = _tmp5_;
-#line 5876 "ui.c"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_width = _tmp2_;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = page;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page_get_height (_tmp3_);
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _tmp4_;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_height = _tmp5_;
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = page;
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = page_get_dpi (_tmp6_);
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _tmp7_;
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_dpi = _tmp8_;
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_state (self, FALSE);
+#line 6032 "ui.c"
 }
 
 
 static void user_interface_page_scan_direction_changed_cb (UserInterface* self, Page* page) {
-	Page* _tmp0_;
+	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
-#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	ScanDirection _tmp2_ = 0;
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_scan_direction = _tmp1_;
-#line 5893 "ui.c"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_scan_direction = _tmp2_;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_state (self, FALSE);
+#line 6054 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _sender);
-#line 5900 "ui.c"
+#line 6061 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb (self, _sender);
-#line 5907 "ui.c"
+#line 6068 "ui.c"
 }
 
 
 static void user_interface_page_added_cb (UserInterface* self, Book* book, Page* page) {
-	Page* _tmp0_;
-	gint _tmp1_ = 0;
-	Page* _tmp2_;
-	gint _tmp3_ = 0;
-	Page* _tmp4_;
-	gint _tmp5_ = 0;
-	Page* _tmp6_;
-	ScanDirection _tmp7_ = 0;
-	Page* _tmp8_;
-	Page* _tmp9_;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+	ScanDirection _tmp2_ = 0;
+	ScanDirection _tmp3_ = 0;
+	Page* _tmp4_ = NULL;
+	Page* _tmp5_ = NULL;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = page_get_width (_tmp0_);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_width = _tmp1_;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page_get_height (_tmp2_);
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_height = _tmp3_;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_size_changed_cb (self, _tmp0_);
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = page;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = page_get_scan_direction (_tmp1_);
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_scan_direction = _tmp3_;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = page_get_dpi (_tmp4_);
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_dpi = _tmp5_;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = page;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = page_get_scan_direction (_tmp6_);
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_scan_direction = _tmp7_;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = page;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp8_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = page;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp9_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = page;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 5962 "ui.c"
+#line 6107 "ui.c"
 }
 
 
 static void user_interface_page_removed_cb (UserInterface* self, Book* book, Page* page) {
-	Page* _tmp0_;
+	Page* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-	Page* _tmp2_;
+	Page* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-	Book* _tmp4_;
+	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	guint _tmp6_ = 0U;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_ == ((guint) 1)) {
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = _tmp5_;
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp6_ == ((guint) 1)) {
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 5999 "ui.c"
+#line 6147 "ui.c"
 	}
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 6003 "ui.c"
+#line 6151 "ui.c"
 }
 
 
 static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi) {
-	GtkCellRendererText* _tmp0_;
-	GtkCellRendererText* renderer;
-	GtkComboBox* _tmp1_;
-	GtkCellRendererText* _tmp2_;
-	GtkComboBox* _tmp3_;
-	GtkCellRendererText* _tmp4_;
-	GtkComboBox* _tmp5_;
+	GtkCellRendererText* renderer = NULL;
+	GtkCellRendererText* _tmp0_ = NULL;
+	GtkComboBox* _tmp1_ = NULL;
+	GtkCellRendererText* _tmp2_ = NULL;
+	GtkComboBox* _tmp3_ = NULL;
+	GtkCellRendererText* _tmp4_ = NULL;
+	GtkListStore* model = NULL;
+	GtkComboBox* _tmp5_ = NULL;
 	GtkTreeModel* _tmp6_ = NULL;
-	GtkListStore* _tmp7_;
-	GtkListStore* model;
+	GtkListStore* _tmp7_ = NULL;
+	gint* scan_resolutions = NULL;
 	gint* _tmp8_ = NULL;
-	gint* scan_resolutions;
-	gint scan_resolutions_length1;
-	gint _scan_resolutions_size_;
-	gint* _tmp9_;
-	gint _tmp9__length1;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint scan_resolutions_length1 = 0;
+	gint _scan_resolutions_size_ = 0;
+	gint* _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp7_;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = g_new0 (gint, 6);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[0] = 75;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[1] = 150;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[2] = 300;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[3] = 600;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[4] = 1200;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[5] = 2400;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp8_;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = scan_resolutions;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9__length1 = scan_resolutions_length1;
-#line 6078 "ui.c"
+#line 6226 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp9_;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp9__length1;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp9__length1; dpi_it = dpi_it + 1) {
-#line 6090 "ui.c"
+#line 6238 "ui.c"
 			gint dpi = 0;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 6094 "ui.c"
+#line 6242 "ui.c"
 			{
 				gchar* label = NULL;
-				gint _tmp10_;
-				gint _tmp11_;
+				gint _tmp10_ = 0;
+				gint _tmp11_ = 0;
 				GtkTreeIter iter = {0};
-				GtkListStore* _tmp26_;
+				GtkListStore* _tmp26_ = NULL;
 				GtkTreeIter _tmp27_ = {0};
-				GtkListStore* _tmp28_;
-				GtkTreeIter _tmp29_;
-				gint _tmp30_;
-				const gchar* _tmp31_;
-				gint _tmp32_;
-				gint _tmp33_;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				GtkListStore* _tmp28_ = NULL;
+				GtkTreeIter _tmp29_ = {0};
+				gint _tmp30_ = 0;
+				const gchar* _tmp31_ = NULL;
+				gint _tmp32_ = 0;
+				gint _tmp33_ = 0;
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = dpi;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = default_dpi;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp10_ == _tmp11_) {
-#line 6114 "ui.c"
+#line 6262 "ui.c"
 					const gchar* _tmp12_ = NULL;
-					gint _tmp13_;
+					gint _tmp13_ = 0;
 					gchar* _tmp14_ = NULL;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = _ ("%d dpi (default)");
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = dpi;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = g_strdup_printf (_tmp12_, _tmp13_);
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp14_;
-#line 6128 "ui.c"
+#line 6276 "ui.c"
 				} else {
-					gint _tmp15_;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gint _tmp15_ = 0;
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = dpi;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp15_ == 75) {
-#line 6135 "ui.c"
+#line 6283 "ui.c"
 						const gchar* _tmp16_ = NULL;
-						gint _tmp17_;
+						gint _tmp17_ = 0;
 						gchar* _tmp18_ = NULL;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp16_ = _ ("%d dpi (draft)");
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = dpi;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp18_;
-#line 6149 "ui.c"
+#line 6297 "ui.c"
 					} else {
-						gint _tmp19_;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gint _tmp19_ = 0;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = dpi;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp19_ == 1200) {
-#line 6156 "ui.c"
+#line 6304 "ui.c"
 							const gchar* _tmp20_ = NULL;
-							gint _tmp21_;
+							gint _tmp21_ = 0;
 							gchar* _tmp22_ = NULL;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = _ ("%d dpi (high resolution)");
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = dpi;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = g_strdup_printf (_tmp20_, _tmp21_);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp22_;
-#line 6170 "ui.c"
+#line 6318 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
-							gint _tmp24_;
+							gint _tmp24_ = 0;
 							gchar* _tmp25_ = NULL;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = _ ("%d dpi");
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = dpi;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp25_;
-#line 6185 "ui.c"
+#line 6333 "ui.c"
 						}
 					}
 				}
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = model;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp26_, &_tmp27_);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp27_;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp28_ = model;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = iter;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = dpi;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = label;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp28_, &_tmp29_, 0, _tmp30_, 1, _tmp31_, -1, -1);
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = dpi;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = current_dpi;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp32_ == _tmp33_) {
-#line 6211 "ui.c"
-					GtkComboBox* _tmp34_;
-					GtkTreeIter _tmp35_;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 6359 "ui.c"
+					GtkComboBox* _tmp34_ = NULL;
+					GtkTreeIter _tmp35_ = {0};
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp34_ = combo;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = iter;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp34_, &_tmp35_);
-#line 6220 "ui.c"
+#line 6368 "ui.c"
 				}
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 6224 "ui.c"
+#line 6372 "ui.c"
 			}
 		}
 	}
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 6234 "ui.c"
+#line 6382 "ui.c"
 }
 
 
 static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
-	GtkMenuItem* _tmp0_;
-	Book* _tmp1_;
+	GtkMenuItem* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	GtkToolButton* _tmp3_;
-	Book* _tmp4_;
-	gboolean _tmp5_ = FALSE;
-	Book* _tmp6_;
+	gboolean _tmp3_ = FALSE;
+	GtkToolButton* _tmp4_ = NULL;
+	Book* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-	GtkMenuItem* _tmp9_;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Book* _tmp8_ = NULL;
+	gboolean _tmp9_ = FALSE;
+	gboolean _tmp10_ = FALSE;
+	GtkMenuItem* _tmp12_ = NULL;
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp2_);
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->save_toolbutton;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = book;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = book_get_needs_saving (_tmp4_);
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp5_);
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = book;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = book_get_needs_saving (_tmp6_);
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_) {
-#line 6274 "ui.c"
-		GtkMenuItem* _tmp8_;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = self->priv->save_as_menuitem;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, TRUE);
-#line 6280 "ui.c"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->save_toolbutton;
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = book;
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = book_get_needs_saving (_tmp5_);
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = _tmp6_;
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = book;
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = book_get_needs_saving (_tmp8_);
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = _tmp9_;
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp10_) {
+#line 6431 "ui.c"
+		GtkMenuItem* _tmp11_ = NULL;
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = self->priv->save_as_menuitem;
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp11_, TRUE);
+#line 6437 "ui.c"
 	}
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->copy_to_clipboard_menuitem;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp9_, TRUE);
-#line 6286 "ui.c"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = self->priv->copy_to_clipboard_menuitem;
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, TRUE);
+#line 6443 "ui.c"
+}
+
+
+static gboolean user_interface_has_app_menu (UserInterface* self, GtkApplication* app) {
+	gboolean result = FALSE;
+	GtkSettings* gtk_settings = NULL;
+	GtkSettings* _tmp0_ = NULL;
+	GtkSettings* _tmp1_ = NULL;
+	gboolean show_app_menu = FALSE;
+	gboolean show_menubar = FALSE;
+	GtkSettings* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (app != NULL, FALSE);
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = gtk_settings_get_default ();
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_settings = _tmp1_;
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	show_app_menu = FALSE;
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	show_menubar = TRUE;
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = gtk_settings;
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_get ((GObject*) _tmp2_, "gtk-shell-shows-app-menu", &show_app_menu, "gtk-shell-shows-menubar", &show_menubar, NULL, NULL);
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = show_app_menu;
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 6480 "ui.c"
+		gboolean _tmp5_ = FALSE;
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = show_menubar;
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = !_tmp5_;
+#line 6486 "ui.c"
+	} else {
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = FALSE;
+#line 6490 "ui.c"
+	}
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = _tmp3_;
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp6_;
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (gtk_settings);
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 6500 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb (self, _sender, response_id);
-#line 6293 "ui.c"
+#line 6507 "ui.c"
+}
+
+
+static void __lambda4_ (UserInterface* self) {
+	GSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->settings;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_text_dpi (self);
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
+#line 6520 "ui.c"
+}
+
+
+static void ___lambda4__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda4_ (self);
+#line 6527 "ui.c"
+}
+
+
+static void __lambda5_ (UserInterface* self) {
+	GSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->settings;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_photo_dpi (self);
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
+#line 6540 "ui.c"
+}
+
+
+static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda5_ (self);
+#line 6547 "ui.c"
+}
+
+
+static void __lambda6_ (UserInterface* self) {
+	GSettings* _tmp0_ = NULL;
+	ScanType _tmp1_ = 0;
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->settings;
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_page_side (self);
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
+#line 6560 "ui.c"
+}
+
+
+static void ___lambda6__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda6_ (self);
+#line 6567 "ui.c"
+}
+
+
+static void __lambda7_ (UserInterface* self) {
+	gint w = 0;
+	gint h = 0;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	GSettings* _tmp2_ = NULL;
+	GSettings* _tmp3_ = NULL;
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	w = _tmp0_;
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	h = _tmp1_;
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = self->priv->settings;
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp2_, "paper-width", w);
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->settings;
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp3_, "paper-height", h);
+#line 6592 "ui.c"
+}
+
+
+static void ___lambda7__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda7_ (self);
+#line 6599 "ui.c"
+}
+
+
+static void __lambda8_ (UserInterface* self) {
+	GSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->settings;
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_brightness (self);
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
+#line 6615 "ui.c"
+}
+
+
+static void ___lambda8__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda8_ (self);
+#line 6622 "ui.c"
+}
+
+
+static void __lambda9_ (UserInterface* self) {
+	GSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->settings;
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_contrast (self);
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
+#line 6638 "ui.c"
+}
+
+
+static void ___lambda9__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda9_ (self);
+#line 6645 "ui.c"
+}
+
+
+static void __lambda10_ (UserInterface* self) {
+	GSettings* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->settings;
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_quality (self);
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
+#line 6661 "ui.c"
+}
+
+
+static void ___lambda10__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda10_ (self);
+#line 6668 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb (self, _sender, page);
-#line 6300 "ui.c"
+#line 6675 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb (self, _sender, page);
-#line 6307 "ui.c"
+#line 6682 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb (self, _sender);
-#line 6314 "ui.c"
-}
-
-
-static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_needs_saving_cb (self, _sender);
-#line 6321 "ui.c"
+#line 6689 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb (self, i);
-#line 6328 "ui.c"
+#line 6696 "ui.c"
 }
 
 
 static void user_interface_load (UserInterface* self) {
 	GtkIconTheme* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_;
-	GtkBuilder* _tmp7_;
-	GtkBuilder* _tmp8_;
-	GObject* _tmp9_ = NULL;
-	GtkWindow* _tmp10_;
-	GApplication* _tmp11_ = NULL;
-	GtkApplication* _tmp12_;
-	GtkApplication* app;
-	GtkApplication* _tmp13_;
-	GtkWindow* _tmp14_;
-	GtkBuilder* _tmp15_;
-	GObject* _tmp16_ = NULL;
-	GtkVBox* _tmp17_;
-	GtkBuilder* _tmp18_;
+	GtkApplication* app = NULL;
+	GApplication* _tmp1_ = NULL;
+	GtkApplication* _tmp2_ = NULL;
+	GtkBuilder* _tmp3_ = NULL;
+	GtkBuilder* _tmp12_ = NULL;
+	GtkBuilder* _tmp13_ = NULL;
+	GObject* _tmp14_ = NULL;
+	GtkApplicationWindow* _tmp15_ = NULL;
+	GtkApplication* _tmp16_ = NULL;
+	GtkApplicationWindow* _tmp17_ = NULL;
+	GtkBuilder* _tmp18_ = NULL;
 	GObject* _tmp19_ = NULL;
-	GtkMenuItem* _tmp20_;
-	GtkBuilder* _tmp21_;
-	GObject* _tmp22_ = NULL;
-	GtkMenuItem* _tmp23_;
-	GtkBuilder* _tmp24_;
-	GObject* _tmp25_ = NULL;
-	GtkMenuItem* _tmp26_;
-	GtkBuilder* _tmp27_;
-	GObject* _tmp28_ = NULL;
-	GtkMenuItem* _tmp29_;
-	GtkBuilder* _tmp30_;
+	GtkMenuBar* _tmp20_ = NULL;
+	GtkApplication* _tmp21_ = NULL;
+	gboolean _tmp22_ = FALSE;
+	GtkBuilder* _tmp30_ = NULL;
 	GObject* _tmp31_ = NULL;
-	GtkMenuItem* _tmp32_;
-	GtkBuilder* _tmp33_;
+	GtkBox* _tmp32_ = NULL;
+	GtkBuilder* _tmp33_ = NULL;
 	GObject* _tmp34_ = NULL;
-	GtkMenuItem* _tmp35_;
-	GtkBuilder* _tmp36_;
+	GtkMenuItem* _tmp35_ = NULL;
+	GtkBuilder* _tmp36_ = NULL;
 	GObject* _tmp37_ = NULL;
-	GtkMenuItem* _tmp38_;
-	GtkBuilder* _tmp39_;
+	GtkMenuItem* _tmp38_ = NULL;
+	GtkBuilder* _tmp39_ = NULL;
 	GObject* _tmp40_ = NULL;
-	GtkToolButton* _tmp41_;
-	GtkBuilder* _tmp42_;
+	GtkMenuItem* _tmp41_ = NULL;
+	GtkBuilder* _tmp42_ = NULL;
 	GObject* _tmp43_ = NULL;
-	GtkMenuItem* _tmp44_;
-	GtkBuilder* _tmp45_;
+	GtkMenuItem* _tmp44_ = NULL;
+	GtkBuilder* _tmp45_ = NULL;
 	GObject* _tmp46_ = NULL;
-	GtkToolButton* _tmp47_;
-	GtkBuilder* _tmp48_;
+	GtkMenuItem* _tmp47_ = NULL;
+	GtkBuilder* _tmp48_ = NULL;
 	GObject* _tmp49_ = NULL;
-	GtkRadioMenuItem* _tmp50_;
-	GtkBuilder* _tmp51_;
+	GtkMenuItem* _tmp50_ = NULL;
+	GtkBuilder* _tmp51_ = NULL;
 	GObject* _tmp52_ = NULL;
-	GtkRadioMenuItem* _tmp53_;
-	GtkBuilder* _tmp54_;
+	GtkMenuItem* _tmp53_ = NULL;
+	GtkBuilder* _tmp54_ = NULL;
 	GObject* _tmp55_ = NULL;
-	GtkRadioMenuItem* _tmp56_;
-	GtkBuilder* _tmp57_;
+	GtkToolButton* _tmp56_ = NULL;
+	GtkBuilder* _tmp57_ = NULL;
 	GObject* _tmp58_ = NULL;
-	GtkRadioMenuItem* _tmp59_;
-	GtkBuilder* _tmp60_;
+	GtkMenuItem* _tmp59_ = NULL;
+	GtkBuilder* _tmp60_ = NULL;
 	GObject* _tmp61_ = NULL;
-	GtkDialog* _tmp62_;
-	GtkBuilder* _tmp63_;
+	GtkToolButton* _tmp62_ = NULL;
+	GtkBuilder* _tmp63_ = NULL;
 	GObject* _tmp64_ = NULL;
-	GtkLabel* _tmp65_;
-	GtkBuilder* _tmp66_;
+	GtkRadioMenuItem* _tmp65_ = NULL;
+	GtkBuilder* _tmp66_ = NULL;
 	GObject* _tmp67_ = NULL;
-	GtkEntry* _tmp68_;
-	GtkBuilder* _tmp69_;
+	GtkRadioMenuItem* _tmp68_ = NULL;
+	GtkBuilder* _tmp69_ = NULL;
 	GObject* _tmp70_ = NULL;
-	GtkEntry* _tmp71_;
-	GtkBuilder* _tmp72_;
+	GtkRadioMenuItem* _tmp71_ = NULL;
+	GtkBuilder* _tmp72_ = NULL;
 	GObject* _tmp73_ = NULL;
-	GtkDialog* _tmp74_;
-	GtkBuilder* _tmp75_;
+	GtkRadioMenuItem* _tmp74_ = NULL;
+	GtkBuilder* _tmp75_ = NULL;
 	GObject* _tmp76_ = NULL;
-	GtkComboBox* _tmp77_;
-	GtkComboBox* _tmp78_;
-	GtkTreeModel* _tmp79_ = NULL;
-	GtkListStore* _tmp80_;
-	GtkBuilder* _tmp81_;
+	GtkDialog* _tmp77_ = NULL;
+	GtkBuilder* _tmp78_ = NULL;
+	GObject* _tmp79_ = NULL;
+	GtkLabel* _tmp80_ = NULL;
+	GtkBuilder* _tmp81_ = NULL;
 	GObject* _tmp82_ = NULL;
-	GtkComboBox* _tmp83_;
-	GtkComboBox* _tmp84_;
-	GtkTreeModel* _tmp85_ = NULL;
-	GtkListStore* _tmp86_;
-	GtkBuilder* _tmp87_;
+	GtkEntry* _tmp83_ = NULL;
+	GtkBuilder* _tmp84_ = NULL;
+	GObject* _tmp85_ = NULL;
+	GtkEntry* _tmp86_ = NULL;
+	GtkBuilder* _tmp87_ = NULL;
 	GObject* _tmp88_ = NULL;
-	GtkComboBox* _tmp89_;
-	GtkComboBox* _tmp90_;
-	GtkTreeModel* _tmp91_ = NULL;
-	GtkListStore* _tmp92_;
-	GtkBuilder* _tmp93_;
-	GObject* _tmp94_ = NULL;
-	GtkComboBox* _tmp95_;
-	GtkComboBox* _tmp96_;
-	GtkTreeModel* _tmp97_ = NULL;
-	GtkListStore* _tmp98_;
-	GtkBuilder* _tmp99_;
-	GObject* _tmp100_ = NULL;
-	GtkComboBox* _tmp101_;
-	GtkComboBox* _tmp102_;
-	GtkTreeModel* _tmp103_ = NULL;
-	GtkListStore* _tmp104_;
-	GtkBuilder* _tmp105_;
-	GObject* _tmp106_ = NULL;
-	GtkScale* _tmp107_;
-	GtkScale* _tmp108_;
-	GtkAdjustment* _tmp109_ = NULL;
-	GtkAdjustment* _tmp110_;
-	GtkBuilder* _tmp111_;
-	GObject* _tmp112_ = NULL;
-	GtkScale* _tmp113_;
-	GtkScale* _tmp114_;
-	GtkAdjustment* _tmp115_ = NULL;
-	GtkAdjustment* _tmp116_;
-	GtkBuilder* _tmp117_;
-	GObject* _tmp118_ = NULL;
-	GtkScale* _tmp119_;
-	GtkScale* _tmp120_;
-	GtkAdjustment* _tmp121_ = NULL;
-	GtkAdjustment* _tmp122_;
-	GtkInfoBar* _tmp123_;
-	GtkInfoBar* _tmp124_;
-	GtkVBox* _tmp125_;
-	GtkInfoBar* _tmp126_;
-	GtkBox* _tmp127_;
-	GtkBox* hbox;
-	GtkInfoBar* _tmp128_;
-	GtkContainer* _tmp129_ = NULL;
-	GtkContainer* _tmp130_;
-	GtkContainer* content_area;
-	GtkContainer* _tmp131_;
-	GtkBox* _tmp132_;
-	GtkBox* _tmp133_;
-	GtkImage* _tmp134_;
-	GtkBox* _tmp135_;
-	GtkImage* _tmp136_;
-	GtkImage* _tmp137_;
-	GtkLabel* _tmp138_;
-	GtkLabel* _tmp139_;
-	GtkBox* _tmp140_;
-	GtkLabel* _tmp141_;
-	GtkLabel* _tmp142_;
-	GtkInfoBar* _tmp143_;
-	GtkButton* _tmp144_ = NULL;
-	GtkButton* _tmp145_;
-	GtkInfoBar* _tmp146_;
-	const gchar* _tmp147_ = NULL;
-	GtkButton* _tmp148_ = NULL;
-	GtkButton* _tmp149_;
+	GtkDialog* _tmp89_ = NULL;
+	GtkBuilder* _tmp90_ = NULL;
+	GObject* _tmp91_ = NULL;
+	GtkComboBox* _tmp92_ = NULL;
+	GtkComboBox* _tmp93_ = NULL;
+	GtkTreeModel* _tmp94_ = NULL;
+	GtkListStore* _tmp95_ = NULL;
+	GtkBuilder* _tmp96_ = NULL;
+	GObject* _tmp97_ = NULL;
+	GtkComboBox* _tmp98_ = NULL;
+	GtkComboBox* _tmp99_ = NULL;
+	GtkTreeModel* _tmp100_ = NULL;
+	GtkListStore* _tmp101_ = NULL;
+	GtkBuilder* _tmp102_ = NULL;
+	GObject* _tmp103_ = NULL;
+	GtkComboBox* _tmp104_ = NULL;
+	GtkComboBox* _tmp105_ = NULL;
+	GtkTreeModel* _tmp106_ = NULL;
+	GtkListStore* _tmp107_ = NULL;
+	GtkBuilder* _tmp108_ = NULL;
+	GObject* _tmp109_ = NULL;
+	GtkComboBox* _tmp110_ = NULL;
+	GtkComboBox* _tmp111_ = NULL;
+	GtkTreeModel* _tmp112_ = NULL;
+	GtkListStore* _tmp113_ = NULL;
+	GtkBuilder* _tmp114_ = NULL;
+	GObject* _tmp115_ = NULL;
+	GtkComboBox* _tmp116_ = NULL;
+	GtkComboBox* _tmp117_ = NULL;
+	GtkTreeModel* _tmp118_ = NULL;
+	GtkListStore* _tmp119_ = NULL;
+	GtkBuilder* _tmp120_ = NULL;
+	GObject* _tmp121_ = NULL;
+	GtkScale* _tmp122_ = NULL;
+	GtkScale* _tmp123_ = NULL;
+	GtkAdjustment* _tmp124_ = NULL;
+	GtkAdjustment* _tmp125_ = NULL;
+	GtkBuilder* _tmp126_ = NULL;
+	GObject* _tmp127_ = NULL;
+	GtkScale* _tmp128_ = NULL;
+	GtkScale* _tmp129_ = NULL;
+	GtkAdjustment* _tmp130_ = NULL;
+	GtkAdjustment* _tmp131_ = NULL;
+	GtkBuilder* _tmp132_ = NULL;
+	GObject* _tmp133_ = NULL;
+	GtkScale* _tmp134_ = NULL;
+	GtkScale* _tmp135_ = NULL;
+	GtkAdjustment* _tmp136_ = NULL;
+	GtkAdjustment* _tmp137_ = NULL;
+	GtkInfoBar* _tmp138_ = NULL;
+	GtkInfoBar* _tmp139_ = NULL;
+	GtkBox* _tmp140_ = NULL;
+	GtkInfoBar* _tmp141_ = NULL;
+	GtkBox* hbox = NULL;
+	GtkBox* _tmp142_ = NULL;
+	GtkContainer* content_area = NULL;
+	GtkInfoBar* _tmp143_ = NULL;
+	GtkContainer* _tmp144_ = NULL;
+	GtkContainer* _tmp145_ = NULL;
+	GtkContainer* _tmp146_ = NULL;
+	GtkBox* _tmp147_ = NULL;
+	GtkBox* _tmp148_ = NULL;
+	GtkImage* _tmp149_ = NULL;
+	GtkBox* _tmp150_ = NULL;
+	GtkImage* _tmp151_ = NULL;
+	GtkImage* _tmp152_ = NULL;
+	GtkLabel* _tmp153_ = NULL;
+	GtkLabel* _tmp154_ = NULL;
+	GtkBox* _tmp155_ = NULL;
+	GtkLabel* _tmp156_ = NULL;
+	GtkLabel* _tmp157_ = NULL;
+	GtkInfoBar* _tmp158_ = NULL;
+	const gchar* _tmp159_ = NULL;
+	GtkButton* _tmp160_ = NULL;
+	GtkButton* _tmp161_ = NULL;
+	GtkInfoBar* _tmp162_ = NULL;
+	const gchar* _tmp163_ = NULL;
+	GtkButton* _tmp164_ = NULL;
+	GtkButton* _tmp165_ = NULL;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp150_;
-	GtkTreeIter _tmp151_ = {0};
-	GtkListStore* _tmp152_;
-	GtkTreeIter _tmp153_;
-	const gchar* _tmp154_ = NULL;
-	GtkListStore* _tmp155_;
-	GtkTreeIter _tmp156_ = {0};
-	GtkListStore* _tmp157_;
-	GtkTreeIter _tmp158_;
-	GtkListStore* _tmp159_;
-	GtkTreeIter _tmp160_ = {0};
-	GtkListStore* _tmp161_;
-	GtkTreeIter _tmp162_;
-	GtkListStore* _tmp163_;
-	GtkTreeIter _tmp164_ = {0};
-	GtkListStore* _tmp165_;
-	GtkTreeIter _tmp166_;
-	GtkListStore* _tmp167_;
-	GtkTreeIter _tmp168_ = {0};
-	GtkListStore* _tmp169_;
-	GtkTreeIter _tmp170_;
-	GtkListStore* _tmp171_;
+	GtkListStore* _tmp166_ = NULL;
+	GtkTreeIter _tmp167_ = {0};
+	GtkListStore* _tmp168_ = NULL;
+	GtkTreeIter _tmp169_ = {0};
+	const gchar* _tmp170_ = NULL;
+	GtkListStore* _tmp171_ = NULL;
 	GtkTreeIter _tmp172_ = {0};
-	GtkListStore* _tmp173_;
-	GtkTreeIter _tmp174_;
-	GtkListStore* _tmp175_;
+	GtkListStore* _tmp173_ = NULL;
+	GtkTreeIter _tmp174_ = {0};
+	GtkListStore* _tmp175_ = NULL;
 	GtkTreeIter _tmp176_ = {0};
-	GtkListStore* _tmp177_;
-	GtkTreeIter _tmp178_;
-	GSettings* _tmp179_;
-	gint _tmp180_ = 0;
-	gint dpi;
-	gint _tmp181_;
-	GtkComboBox* _tmp182_;
-	gint _tmp183_;
-	GSettings* _tmp184_;
-	gint _tmp185_ = 0;
-	gint _tmp186_;
-	GtkComboBox* _tmp187_;
-	gint _tmp188_;
-	GtkCellRendererText* _tmp189_;
-	GtkCellRendererText* renderer;
-	GtkComboBox* _tmp190_;
-	GtkCellRendererText* _tmp191_;
-	GtkComboBox* _tmp192_;
-	GtkCellRendererText* _tmp193_;
-	GtkCellRendererText* _tmp194_;
-	GtkComboBox* _tmp195_;
-	GtkCellRendererText* _tmp196_;
-	GtkComboBox* _tmp197_;
-	GtkCellRendererText* _tmp198_;
-	GSettings* _tmp199_;
-	gint _tmp200_ = 0;
-	GtkCellRendererText* _tmp201_;
-	GtkComboBox* _tmp202_;
-	GtkCellRendererText* _tmp203_;
-	GtkComboBox* _tmp204_;
-	GtkCellRendererText* _tmp205_;
-	GSettings* _tmp206_;
-	gint _tmp207_ = 0;
-	gint paper_width;
-	GSettings* _tmp208_;
-	gint _tmp209_ = 0;
-	gint paper_height;
-	gint _tmp210_;
-	gint _tmp211_;
-	GtkAdjustment* _tmp212_;
-	gdouble _tmp213_ = 0.0;
-	gdouble lower;
-	const gchar* _tmp214_ = NULL;
-	gchar* _tmp215_ = NULL;
-	gchar* darker_label;
-	GtkAdjustment* _tmp216_;
-	gdouble _tmp217_ = 0.0;
-	gdouble upper;
-	const gchar* _tmp218_ = NULL;
-	gchar* _tmp219_ = NULL;
-	gchar* lighter_label;
-	GtkScale* _tmp220_;
-	gdouble _tmp221_;
-	const gchar* _tmp222_;
-	GtkScale* _tmp223_;
-	GtkScale* _tmp224_;
-	gdouble _tmp225_;
-	const gchar* _tmp226_;
-	GSettings* _tmp227_;
+	GtkListStore* _tmp177_ = NULL;
+	GtkTreeIter _tmp178_ = {0};
+	GtkListStore* _tmp179_ = NULL;
+	GtkTreeIter _tmp180_ = {0};
+	GtkListStore* _tmp181_ = NULL;
+	GtkTreeIter _tmp182_ = {0};
+	GtkListStore* _tmp183_ = NULL;
+	GtkTreeIter _tmp184_ = {0};
+	GtkListStore* _tmp185_ = NULL;
+	GtkTreeIter _tmp186_ = {0};
+	GtkListStore* _tmp187_ = NULL;
+	GtkTreeIter _tmp188_ = {0};
+	GtkListStore* _tmp189_ = NULL;
+	GtkTreeIter _tmp190_ = {0};
+	GtkListStore* _tmp191_ = NULL;
+	GtkTreeIter _tmp192_ = {0};
+	GtkListStore* _tmp193_ = NULL;
+	GtkTreeIter _tmp194_ = {0};
+	gint dpi = 0;
+	GSettings* _tmp195_ = NULL;
+	gint _tmp196_ = 0;
+	gint _tmp197_ = 0;
+	GtkComboBox* _tmp198_ = NULL;
+	gint _tmp199_ = 0;
+	GtkComboBox* _tmp200_ = NULL;
+	GSettings* _tmp201_ = NULL;
+	gint _tmp202_ = 0;
+	gint _tmp203_ = 0;
+	GtkComboBox* _tmp204_ = NULL;
+	gint _tmp205_ = 0;
+	GtkComboBox* _tmp206_ = NULL;
+	GtkCellRendererText* renderer = NULL;
+	GtkCellRendererText* _tmp207_ = NULL;
+	GtkComboBox* _tmp208_ = NULL;
+	GtkCellRendererText* _tmp209_ = NULL;
+	GtkComboBox* _tmp210_ = NULL;
+	GtkCellRendererText* _tmp211_ = NULL;
+	GtkCellRendererText* _tmp212_ = NULL;
+	GtkComboBox* _tmp213_ = NULL;
+	GtkCellRendererText* _tmp214_ = NULL;
+	GtkComboBox* _tmp215_ = NULL;
+	GtkCellRendererText* _tmp216_ = NULL;
+	GSettings* _tmp217_ = NULL;
+	gint _tmp218_ = 0;
+	GtkComboBox* _tmp219_ = NULL;
+	GtkCellRendererText* _tmp220_ = NULL;
+	GtkComboBox* _tmp221_ = NULL;
+	GtkCellRendererText* _tmp222_ = NULL;
+	GtkComboBox* _tmp223_ = NULL;
+	GtkCellRendererText* _tmp224_ = NULL;
+	gint paper_width = 0;
+	GSettings* _tmp225_ = NULL;
+	gint _tmp226_ = 0;
+	gint paper_height = 0;
+	GSettings* _tmp227_ = NULL;
 	gint _tmp228_ = 0;
-	GtkAdjustment* _tmp229_;
-	gdouble _tmp230_ = 0.0;
-	const gchar* _tmp231_ = NULL;
-	gchar* _tmp232_ = NULL;
-	gchar* less_label;
-	GtkAdjustment* _tmp233_;
-	gdouble _tmp234_ = 0.0;
-	const gchar* _tmp235_ = NULL;
-	gchar* _tmp236_ = NULL;
-	gchar* more_label;
-	GtkScale* _tmp237_;
-	gdouble _tmp238_;
-	const gchar* _tmp239_;
-	GtkScale* _tmp240_;
-	GtkScale* _tmp241_;
-	gdouble _tmp242_;
-	const gchar* _tmp243_;
-	GSettings* _tmp244_;
-	gint _tmp245_ = 0;
-	GtkAdjustment* _tmp246_;
-	gdouble _tmp247_ = 0.0;
-	const gchar* _tmp248_ = NULL;
-	gchar* _tmp249_ = NULL;
-	gchar* minimum_label;
-	GtkAdjustment* _tmp250_;
+	gint _tmp229_ = 0;
+	gint _tmp230_ = 0;
+	GtkComboBox* _tmp231_ = NULL;
+	gdouble lower = 0.0;
+	GtkAdjustment* _tmp232_ = NULL;
+	gdouble _tmp233_ = 0.0;
+	gchar* darker_label = NULL;
+	const gchar* _tmp234_ = NULL;
+	gchar* _tmp235_ = NULL;
+	gdouble upper = 0.0;
+	GtkAdjustment* _tmp236_ = NULL;
+	gdouble _tmp237_ = 0.0;
+	gchar* lighter_label = NULL;
+	const gchar* _tmp238_ = NULL;
+	gchar* _tmp239_ = NULL;
+	GtkScale* _tmp240_ = NULL;
+	gdouble _tmp241_ = 0.0;
+	const gchar* _tmp242_ = NULL;
+	GtkScale* _tmp243_ = NULL;
+	GtkScale* _tmp244_ = NULL;
+	gdouble _tmp245_ = 0.0;
+	const gchar* _tmp246_ = NULL;
+	GSettings* _tmp247_ = NULL;
+	gint _tmp248_ = 0;
+	GtkAdjustment* _tmp249_ = NULL;
+	GtkAdjustment* _tmp250_ = NULL;
 	gdouble _tmp251_ = 0.0;
+	gchar* less_label = NULL;
 	const gchar* _tmp252_ = NULL;
 	gchar* _tmp253_ = NULL;
-	gchar* maximum_label;
-	GtkScale* _tmp254_;
-	gdouble _tmp255_;
-	const gchar* _tmp256_;
-	GtkScale* _tmp257_;
-	GtkScale* _tmp258_;
-	gdouble _tmp259_;
-	const gchar* _tmp260_;
-	GSettings* _tmp261_;
-	gint _tmp262_ = 0;
-	GSettings* _tmp263_;
-	gchar* _tmp264_ = NULL;
-	gchar* device;
-	const gchar* _tmp265_;
-	GSettings* _tmp271_;
-	gchar* _tmp272_ = NULL;
-	gchar* document_type;
-	const gchar* _tmp273_;
-	Book* _tmp275_;
-	BookView* _tmp276_;
-	BookView* _tmp277_;
-	GtkVBox* _tmp278_;
-	BookView* _tmp279_;
-	BookView* _tmp280_;
-	BookView* _tmp281_;
-	BookView* _tmp282_;
-	BookView* _tmp283_;
-	GSettings* _tmp284_;
-	gint _tmp285_ = 0;
-	GSettings* _tmp286_;
-	gint _tmp287_ = 0;
-	gint _tmp288_;
-	GSettings* _tmp289_;
-	gint _tmp290_ = 0;
-	gint _tmp291_;
-	GSettings* _tmp292_;
-	gint _tmp293_ = 0;
-	gint _tmp294_;
-	GSettings* _tmp295_;
-	gint _tmp296_ = 0;
-	gint _tmp297_;
-	GSettings* _tmp298_;
-	gint _tmp299_ = 0;
-	gint _tmp300_;
-	gint _tmp301_;
-	gint _tmp302_;
-	GtkWindow* _tmp303_;
-	gint _tmp304_;
-	gint _tmp305_;
-	GSettings* _tmp306_;
-	gboolean _tmp307_ = FALSE;
-	gboolean _tmp308_;
-	Book* _tmp310_;
-	guint _tmp311_ = 0U;
-	Book* _tmp312_;
-	Book* _tmp313_;
-	GtkWindow* _tmp314_;
+	GtkAdjustment* _tmp254_ = NULL;
+	gdouble _tmp255_ = 0.0;
+	gchar* more_label = NULL;
+	const gchar* _tmp256_ = NULL;
+	gchar* _tmp257_ = NULL;
+	GtkScale* _tmp258_ = NULL;
+	gdouble _tmp259_ = 0.0;
+	const gchar* _tmp260_ = NULL;
+	GtkScale* _tmp261_ = NULL;
+	GtkScale* _tmp262_ = NULL;
+	gdouble _tmp263_ = 0.0;
+	const gchar* _tmp264_ = NULL;
+	GSettings* _tmp265_ = NULL;
+	gint _tmp266_ = 0;
+	GtkAdjustment* _tmp267_ = NULL;
+	GtkAdjustment* _tmp268_ = NULL;
+	gdouble _tmp269_ = 0.0;
+	gchar* minimum_label = NULL;
+	const gchar* _tmp270_ = NULL;
+	gchar* _tmp271_ = NULL;
+	GtkAdjustment* _tmp272_ = NULL;
+	gdouble _tmp273_ = 0.0;
+	gchar* maximum_label = NULL;
+	const gchar* _tmp274_ = NULL;
+	gchar* _tmp275_ = NULL;
+	GtkScale* _tmp276_ = NULL;
+	gdouble _tmp277_ = 0.0;
+	const gchar* _tmp278_ = NULL;
+	GtkScale* _tmp279_ = NULL;
+	GtkScale* _tmp280_ = NULL;
+	gdouble _tmp281_ = 0.0;
+	const gchar* _tmp282_ = NULL;
+	GSettings* _tmp283_ = NULL;
+	gint _tmp284_ = 0;
+	GtkAdjustment* _tmp285_ = NULL;
+	gchar* device = NULL;
+	GSettings* _tmp286_ = NULL;
+	gchar* _tmp287_ = NULL;
+	const gchar* _tmp288_ = NULL;
+	gchar* document_type = NULL;
+	GSettings* _tmp294_ = NULL;
+	gchar* _tmp295_ = NULL;
+	const gchar* _tmp296_ = NULL;
+	Book* _tmp298_ = NULL;
+	BookView* _tmp299_ = NULL;
+	BookView* _tmp300_ = NULL;
+	GtkBox* _tmp301_ = NULL;
+	BookView* _tmp302_ = NULL;
+	BookView* _tmp303_ = NULL;
+	BookView* _tmp304_ = NULL;
+	BookView* _tmp305_ = NULL;
+	BookView* _tmp306_ = NULL;
+	gint _tmp307_ = 0;
+	gint _tmp308_ = 0;
+	GtkApplicationWindow* _tmp309_ = NULL;
+	gint _tmp310_ = 0;
+	gint _tmp311_ = 0;
+	gboolean _tmp312_ = FALSE;
+	GtkApplicationWindow* _tmp314_ = NULL;
 	const gchar* _tmp315_ = NULL;
-	ProgressBarDialog* _tmp316_;
-	Book* _tmp317_;
+	ProgressBarDialog* _tmp316_ = NULL;
+	Book* _tmp317_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_builder_new ();
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_application_get_default ();
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, GTK_TYPE_APPLICATION) ? ((GtkApplication*) _tmp1_) : NULL);
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	app = _tmp2_;
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = gtk_builder_new ();
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->builder = _tmp1_;
-#line 6672 "ui.c"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->builder = _tmp3_;
+#line 7036 "ui.c"
 	{
-		GtkBuilder* _tmp2_;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = self->priv->builder;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_builder_add_from_resource (_tmp2_, "/org/gnome/SimpleScan/simple-scan.ui", &_inner_error_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkBuilder* _tmp4_ = NULL;
+		GtkApplication* _tmp5_ = NULL;
+		gboolean _tmp6_ = FALSE;
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = self->priv->builder;
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_builder_add_from_resource (_tmp4_, "/org/gnome/SimpleScan/simple-scan.ui", &_inner_error_);
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 6681 "ui.c"
+#line 7047 "ui.c"
 			goto __catch21_g_error;
 		}
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = app;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = user_interface_has_app_menu (self, _tmp5_);
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp6_) {
+#line 7056 "ui.c"
+			GtkBuilder* _tmp7_ = NULL;
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp7_ = self->priv->builder;
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_builder_add_from_resource (_tmp7_, "/org/gnome/SimpleScan/simple-scan-menu.ui", &_inner_error_);
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_inner_error_ != NULL) {
+#line 7064 "ui.c"
+				goto __catch21_g_error;
+			}
+		}
 	}
 	goto __finally21;
 	__catch21_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp3_;
-		const gchar* _tmp4_;
-		const gchar* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GError* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = e;
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = _tmp3_->message;
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_critical ("ui.vala:1331: Unable to load UI: %s\n", _tmp4_);
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _ ("Files missing");
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = _ ("Please check your installation");
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp5_, _tmp6_);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = e;
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = _tmp8_->message;
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_critical ("ui.vala:1442: Unable to load UI: %s\n", _tmp9_);
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = _ ("Files missing");
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = _ ("Please check your installation");
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error_dialog (self, _tmp10_, _tmp11_);
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		exit (EXIT_FAILURE);
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6713 "ui.c"
+#line 7097 "ui.c"
 	}
 	__finally21:
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 6724 "ui.c"
-	}
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = self->priv->builder;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_builder_connect_signals (_tmp7_, self);
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->builder;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = gtk_builder_get_object (_tmp8_, "simple_scan_window");
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_WINDOW, GtkWindow));
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->window);
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window = _tmp10_;
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = g_application_get_default ();
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_APPLICATION) ? ((GtkApplication*) _tmp11_) : NULL);
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	app = _tmp12_;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = app;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = self->priv->window;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_application_add_window (_tmp13_, _tmp14_);
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->builder;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = gtk_builder_get_object (_tmp15_, "main_vbox");
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_VBOX, GtkVBox));
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->main_vbox);
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->main_vbox = _tmp17_;
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = self->priv->builder;
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "page_move_left_menuitem");
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_move_left_menuitem = _tmp20_;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = self->priv->builder;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = gtk_builder_get_object (_tmp21_, "page_move_right_menuitem");
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_move_right_menuitem = _tmp23_;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = self->priv->builder;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = gtk_builder_get_object (_tmp24_, "page_delete_menuitem");
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_delete_menuitem = _tmp26_;
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = self->priv->builder;
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = gtk_builder_get_object (_tmp27_, "crop_rotate_menuitem");
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->crop_rotate_menuitem = _tmp29_;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = self->priv->builder;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = gtk_builder_get_object (_tmp30_, "save_menuitem");
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_menuitem);
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_menuitem = _tmp32_;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = self->priv->builder;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = gtk_builder_get_object (_tmp33_, "save_as_menuitem");
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_as_menuitem = _tmp35_;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = self->priv->builder;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = gtk_builder_get_object (_tmp36_, "copy_to_clipboard_menuitem");
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->copy_to_clipboard_menuitem = _tmp38_;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = self->priv->builder;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = gtk_builder_get_object (_tmp39_, "save_toolbutton");
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_toolbutton);
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_toolbutton = _tmp41_;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = self->priv->builder;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp43_ = gtk_builder_get_object (_tmp42_, "stop_scan_menuitem");
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_menuitem);
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->stop_menuitem = _tmp44_;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp45_ = self->priv->builder;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = gtk_builder_get_object (_tmp45_, "stop_toolbutton");
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->stop_toolbutton = _tmp47_;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = self->priv->builder;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp49_ = gtk_builder_get_object (_tmp48_, "text_toolbutton_menuitem");
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_toolbar_menuitem);
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_toolbar_menuitem = _tmp50_;
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = self->priv->builder;
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = gtk_builder_get_object (_tmp51_, "text_menuitem");
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_menu_menuitem);
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_menu_menuitem = _tmp53_;
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = self->priv->builder;
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = gtk_builder_get_object (_tmp54_, "photo_toolbutton_menuitem");
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_toolbar_menuitem = _tmp56_;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = self->priv->builder;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = gtk_builder_get_object (_tmp57_, "photo_menuitem");
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_menu_menuitem);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_menu_menuitem = _tmp59_;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = self->priv->builder;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = gtk_builder_get_object (_tmp60_, "authorize_dialog");
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_DIALOG, GtkDialog));
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->authorize_dialog);
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->authorize_dialog = _tmp62_;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = self->priv->builder;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = gtk_builder_get_object (_tmp63_, "authorize_label");
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GTK_TYPE_LABEL, GtkLabel));
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->authorize_label);
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->authorize_label = _tmp65_;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = self->priv->builder;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = gtk_builder_get_object (_tmp66_, "username_entry");
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_ENTRY, GtkEntry));
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->username_entry);
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->username_entry = _tmp68_;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = self->priv->builder;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = gtk_builder_get_object (_tmp69_, "password_entry");
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_ENTRY, GtkEntry));
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->password_entry);
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->password_entry = _tmp71_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = self->priv->builder;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp73_ = gtk_builder_get_object (_tmp72_, "preferences_dialog");
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_DIALOG, GtkDialog));
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->preferences_dialog);
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->preferences_dialog = _tmp74_;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = self->priv->builder;
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = gtk_builder_get_object (_tmp75_, "device_combo");
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->device_combo);
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->device_combo = _tmp77_;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp78_ = self->priv->device_combo;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp79_ = gtk_combo_box_get_model (_tmp78_);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->device_model);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->device_model = _tmp80_;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp81_ = self->priv->builder;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp82_ = gtk_builder_get_object (_tmp81_, "text_dpi_combo");
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_dpi_combo = _tmp83_;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp84_ = self->priv->text_dpi_combo;
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = gtk_combo_box_get_model (_tmp84_);
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_dpi_model);
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_dpi_model = _tmp86_;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp87_ = self->priv->builder;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = gtk_builder_get_object (_tmp87_, "photo_dpi_combo");
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_dpi_combo = _tmp89_;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = self->priv->photo_dpi_combo;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = gtk_combo_box_get_model (_tmp90_);
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_dpi_model = _tmp92_;
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp93_ = self->priv->builder;
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp94_ = gtk_builder_get_object (_tmp93_, "page_side_combo");
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_side_combo);
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_side_combo = _tmp95_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp96_ = self->priv->page_side_combo;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp97_ = gtk_combo_box_get_model (_tmp96_);
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_side_model);
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_side_model = _tmp98_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp99_ = self->priv->builder;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp100_ = gtk_builder_get_object (_tmp99_, "paper_size_combo");
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->paper_size_combo);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->paper_size_combo = _tmp101_;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp102_ = self->priv->paper_size_combo;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp103_ = gtk_combo_box_get_model (_tmp102_);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->paper_size_model);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->paper_size_model = _tmp104_;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp105_ = self->priv->builder;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp106_ = gtk_builder_get_object (_tmp105_, "brightness_scale");
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GTK_TYPE_SCALE, GtkScale));
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->brightness_scale);
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->brightness_scale = _tmp107_;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp108_ = self->priv->brightness_scale;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp109_ = gtk_range_get_adjustment ((GtkRange*) _tmp108_);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp110_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->brightness_adjustment = _tmp110_;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = self->priv->builder;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp112_ = gtk_builder_get_object (_tmp111_, "contrast_scale");
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GTK_TYPE_SCALE, GtkScale));
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->contrast_scale);
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->contrast_scale = _tmp113_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = self->priv->contrast_scale;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = gtk_range_get_adjustment ((GtkRange*) _tmp114_);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->contrast_adjustment = _tmp116_;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = self->priv->builder;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp118_ = gtk_builder_get_object (_tmp117_, "quality_scale");
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp119_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GTK_TYPE_SCALE, GtkScale));
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->quality_scale);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->quality_scale = _tmp119_;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = self->priv->quality_scale;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp121_ = gtk_range_get_adjustment ((GtkRange*) _tmp120_);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp122_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->quality_adjustment);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->quality_adjustment = _tmp122_;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp123_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp123_);
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar);
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar = _tmp123_;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp124_ = self->priv->info_bar;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp124_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self);
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp125_ = self->priv->main_vbox;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp126_ = self->priv->info_bar;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start ((GtkBox*) _tmp125_, (GtkWidget*) _tmp126_, FALSE, TRUE, (guint) 0);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp127_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp127_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	hbox = _tmp127_;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp128_ = self->priv->info_bar;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp129_ = gtk_info_bar_get_content_area (_tmp128_);
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp130_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, GTK_TYPE_CONTAINER, GtkContainer));
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	content_area = _tmp130_;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp131_ = content_area;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp132_ = hbox;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add (_tmp131_, (GtkWidget*) _tmp132_);
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp133_ = hbox;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp133_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp134_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp134_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_image);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_image = _tmp134_;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp135_ = hbox;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp136_ = self->priv->info_bar_image;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp135_, (GtkWidget*) _tmp136_, FALSE, TRUE, (guint) 0);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp137_ = self->priv->info_bar_image;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp137_);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp138_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp138_);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_label);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_label = _tmp138_;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp139_ = self->priv->info_bar_label;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_misc_set_alignment ((GtkMisc*) _tmp139_, 0.0f, 0.5f);
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp140_ = hbox;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp141_ = self->priv->info_bar_label;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp140_, (GtkWidget*) _tmp141_, TRUE, TRUE, (guint) 0);
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp142_ = self->priv->info_bar_label;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp142_);
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp143_ = self->priv->info_bar;
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp144_ = gtk_info_bar_add_button (_tmp143_, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE);
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp145_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, GTK_TYPE_BUTTON, GtkButton));
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_close_button = _tmp145_;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp146_ = self->priv->info_bar;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp147_ = _ ("Change _Scanner");
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp148_ = gtk_info_bar_add_button (_tmp146_, _tmp147_, 1);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp149_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GTK_TYPE_BUTTON, GtkButton));
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_change_scanner_button = _tmp149_;
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp150_ = self->priv->paper_size_model;
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp150_, &_tmp151_);
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp151_;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp152_ = self->priv->paper_size_model;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp153_ = iter;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp154_ = _ ("Automatic");
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp152_, &_tmp153_, 0, 0, 1, 0, 2, _tmp154_, -1, -1);
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp155_ = self->priv->paper_size_model;
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp155_, &_tmp156_);
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp156_;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp157_ = self->priv->paper_size_model;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp158_ = iter;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp157_, &_tmp158_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp159_ = self->priv->paper_size_model;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp159_, &_tmp160_);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp160_;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp161_ = self->priv->paper_size_model;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp162_ = iter;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp161_, &_tmp162_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp163_ = self->priv->paper_size_model;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp163_, &_tmp164_);
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp164_;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp165_ = self->priv->paper_size_model;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp166_ = iter;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp165_, &_tmp166_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp167_ = self->priv->paper_size_model;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp167_, &_tmp168_);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp168_;
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp169_ = self->priv->paper_size_model;
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp170_ = iter;
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp169_, &_tmp170_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp171_ = self->priv->paper_size_model;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp171_, &_tmp172_);
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp172_;
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp173_ = self->priv->paper_size_model;
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp174_ = iter;
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp173_, &_tmp174_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp175_ = self->priv->paper_size_model;
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp175_, &_tmp176_);
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp176_;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp177_ = self->priv->paper_size_model;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp178_ = iter;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp177_, &_tmp178_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp179_ = self->priv->settings;
-#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp180_ = g_settings_get_int (_tmp179_, "text-dpi");
-#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp180_;
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp181_ = dpi;
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp181_ <= 0) {
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 7314 "ui.c"
-	}
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp182_ = self->priv->text_dpi_combo;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp183_ = dpi;
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp182_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp183_);
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp184_ = self->priv->settings;
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp185_ = g_settings_get_int (_tmp184_, "photo-dpi");
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp185_;
-#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp186_ = dpi;
-#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp186_ <= 0) {
-#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 7334 "ui.c"
-	}
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp187_ = self->priv->photo_dpi_combo;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp188_ = dpi;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp187_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp188_);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp189_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp189_);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp189_;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp190_ = self->priv->device_combo;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp191_ = renderer;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp190_, (GtkCellRenderer*) _tmp191_, TRUE);
 #line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp192_ = self->priv->device_combo;
+		_g_object_unref0 (app);
 #line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp193_ = renderer;
+		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 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp192_, (GtkCellRenderer*) _tmp193_, "text", 1);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp194_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp194_);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp194_;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp195_ = self->priv->page_side_combo;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp196_ = renderer;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp195_, (GtkCellRenderer*) _tmp196_, TRUE);
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp197_ = self->priv->page_side_combo;
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp198_ = renderer;
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp197_, (GtkCellRenderer*) _tmp198_, "text", 1);
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp199_ = self->priv->settings;
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp200_ = g_settings_get_enum (_tmp199_, "page-side");
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_page_side (self, (ScanType) _tmp200_);
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp201_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp201_);
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp201_;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp202_ = self->priv->paper_size_combo;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp203_ = renderer;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp202_, (GtkCellRenderer*) _tmp203_, TRUE);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp204_ = self->priv->paper_size_combo;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp205_ = renderer;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp204_, (GtkCellRenderer*) _tmp205_, "text", 2);
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp206_ = self->priv->settings;
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp207_ = g_settings_get_int (_tmp206_, "paper-width");
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp207_;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp208_ = self->priv->settings;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp209_ = g_settings_get_int (_tmp208_, "paper-height");
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp209_;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp210_ = paper_width;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp211_ = paper_height;
-#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_paper_size (self, _tmp210_, _tmp211_);
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp212_ = self->priv->brightness_adjustment;
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp213_ = gtk_adjustment_get_lower (_tmp212_);
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp213_;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp214_ = _ ("Darker");
+		g_clear_error (&_inner_error_);
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 7110 "ui.c"
+	}
 #line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp215_ = g_strdup_printf ("<small>%s</small>", _tmp214_);
+	_tmp12_ = self->priv->builder;
 #line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	darker_label = _tmp215_;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp216_ = self->priv->brightness_adjustment;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp217_ = gtk_adjustment_get_upper (_tmp216_);
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp217_;
+	gtk_builder_connect_signals (_tmp12_, self);
 #line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp218_ = _ ("Lighter");
+	_tmp13_ = self->priv->builder;
 #line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp219_ = g_strdup_printf ("<small>%s</small>", _tmp218_);
+	_tmp14_ = gtk_builder_get_object (_tmp13_, "simple_scan_window");
 #line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lighter_label = _tmp219_;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp220_ = self->priv->brightness_scale;
+	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow));
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->window);
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window = _tmp15_;
 #line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp221_ = lower;
+	_tmp16_ = app;
 #line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp222_ = darker_label;
+	_tmp17_ = self->priv->window;
 #line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp220_, _tmp221_, GTK_POS_BOTTOM, _tmp222_);
+	gtk_application_add_window (_tmp16_, (GtkWindow*) _tmp17_);
 #line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp223_ = self->priv->brightness_scale;
+	_tmp18_ = self->priv->builder;
 #line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp223_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp224_ = self->priv->brightness_scale;
+	_tmp19_ = gtk_builder_get_object (_tmp18_, "menubar");
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_MENU_BAR, GtkMenuBar));
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->menubar);
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->menubar = _tmp20_;
 #line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp225_ = upper;
+	_tmp21_ = app;
 #line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = lighter_label;
+	_tmp22_ = user_interface_has_app_menu (self, _tmp21_);
 #line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp224_, _tmp225_, GTK_POS_BOTTOM, _tmp226_);
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = self->priv->settings;
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp228_ = g_settings_get_int (_tmp227_, "brightness");
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_brightness (self, _tmp228_);
+	if (_tmp22_) {
+#line 7148 "ui.c"
+		GtkBuilder* _tmp23_ = NULL;
+		GObject* _tmp24_ = NULL;
+		GMenuModel* _tmp25_ = NULL;
+		GtkApplication* _tmp26_ = NULL;
+		GtkApplication* _tmp27_ = NULL;
+		GMenuModel* _tmp28_ = NULL;
+		GtkMenuBar* _tmp29_ = NULL;
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp23_ = self->priv->builder;
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp24_ = gtk_builder_get_object (_tmp23_, "appmenu");
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, g_menu_model_get_type (), GMenuModel));
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (self->priv->app_menu);
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->app_menu = _tmp25_;
 #line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp229_ = self->priv->contrast_adjustment;
+		_tmp26_ = app;
 #line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp230_ = gtk_adjustment_get_lower (_tmp229_);
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp230_;
+		g_action_map_add_action_entries ((GActionMap*) _tmp26_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
 #line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = _ ("Less");
+		_tmp27_ = app;
 #line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp232_ = g_strdup_printf ("<small>%s</small>", _tmp231_);
+		_tmp28_ = self->priv->app_menu;
 #line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	less_label = _tmp232_;
-#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp233_ = self->priv->contrast_adjustment;
+		gtk_application_set_app_menu (_tmp27_, _tmp28_);
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp234_ = gtk_adjustment_get_upper (_tmp233_);
+		_tmp29_ = self->priv->menubar;
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp234_;
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp235_ = _ ("More");
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp236_ = g_strdup_printf ("<small>%s</small>", _tmp235_);
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	more_label = _tmp236_;
+		gtk_widget_set_visible ((GtkWidget*) _tmp29_, FALSE);
+#line 7180 "ui.c"
+	}
 #line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp237_ = self->priv->contrast_scale;
+	_tmp30_ = self->priv->builder;
 #line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = lower;
+	_tmp31_ = gtk_builder_get_object (_tmp30_, "main_vbox");
 #line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = less_label;
+	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_BOX, GtkBox));
 #line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp237_, _tmp238_, GTK_POS_BOTTOM, _tmp239_);
+	_g_object_unref0 (self->priv->main_vbox);
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->main_vbox = _tmp32_;
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = self->priv->builder;
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = gtk_builder_get_object (_tmp33_, "page_move_left_menuitem");
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp240_ = self->priv->contrast_scale;
+	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->page_move_left_menuitem);
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp240_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+	self->priv->page_move_left_menuitem = _tmp35_;
 #line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp241_ = self->priv->contrast_scale;
+	_tmp36_ = self->priv->builder;
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = gtk_builder_get_object (_tmp36_, "page_move_right_menuitem");
 #line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp242_ = upper;
+	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
 #line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp243_ = more_label;
+	_g_object_unref0 (self->priv->page_move_right_menuitem);
 #line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp241_, _tmp242_, GTK_POS_BOTTOM, _tmp243_);
+	self->priv->page_move_right_menuitem = _tmp38_;
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = self->priv->builder;
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = gtk_builder_get_object (_tmp39_, "page_delete_menuitem");
 #line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp244_ = self->priv->settings;
+	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
 #line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp245_ = g_settings_get_int (_tmp244_, "contrast");
+	_g_object_unref0 (self->priv->page_delete_menuitem);
 #line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_contrast (self, _tmp245_);
+	self->priv->page_delete_menuitem = _tmp41_;
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = self->priv->builder;
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp43_ = gtk_builder_get_object (_tmp42_, "crop_rotate_menuitem");
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->crop_rotate_menuitem);
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->crop_rotate_menuitem = _tmp44_;
 #line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp246_ = self->priv->quality_adjustment;
+	_tmp45_ = self->priv->builder;
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp46_ = gtk_builder_get_object (_tmp45_, "save_menuitem");
 #line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp247_ = gtk_adjustment_get_lower (_tmp246_);
+	_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->save_menuitem);
 #line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp247_;
+	self->priv->save_menuitem = _tmp47_;
 #line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp248_ = _ ("Minimum");
+	_tmp48_ = self->priv->builder;
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp49_ = gtk_builder_get_object (_tmp48_, "save_as_menuitem");
 #line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp249_ = g_strdup_printf ("<small>%s</small>", _tmp248_);
+	_tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->save_as_menuitem);
 #line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	minimum_label = _tmp249_;
+	self->priv->save_as_menuitem = _tmp50_;
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp250_ = self->priv->quality_adjustment;
+	_tmp51_ = self->priv->builder;
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp52_ = gtk_builder_get_object (_tmp51_, "copy_to_clipboard_menuitem");
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp251_ = gtk_adjustment_get_upper (_tmp250_);
+	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp251_;
+	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->copy_to_clipboard_menuitem = _tmp53_;
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = self->priv->builder;
 #line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp252_ = _ ("Maximum");
+	_tmp55_ = gtk_builder_get_object (_tmp54_, "save_toolbutton");
 #line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp253_ = g_strdup_printf ("<small>%s</small>", _tmp252_);
+	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
 #line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	maximum_label = _tmp253_;
+	_g_object_unref0 (self->priv->save_toolbutton);
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_toolbutton = _tmp56_;
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = self->priv->builder;
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp254_ = self->priv->quality_scale;
+	_tmp58_ = gtk_builder_get_object (_tmp57_, "stop_scan_menuitem");
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp255_ = lower;
+	_tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp256_ = minimum_label;
+	_g_object_unref0 (self->priv->stop_menuitem);
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp254_, _tmp255_, GTK_POS_BOTTOM, _tmp256_);
+	self->priv->stop_menuitem = _tmp59_;
 #line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp257_ = self->priv->quality_scale;
+	_tmp60_ = self->priv->builder;
 #line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp257_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp258_ = self->priv->quality_scale;
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp259_ = upper;
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp260_ = maximum_label;
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp258_, _tmp259_, GTK_POS_BOTTOM, _tmp260_);
+	_tmp61_ = gtk_builder_get_object (_tmp60_, "stop_toolbutton");
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->stop_toolbutton);
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->stop_toolbutton = _tmp62_;
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = self->priv->builder;
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = gtk_builder_get_object (_tmp63_, "text_toolbutton_menuitem");
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp261_ = self->priv->settings;
+	_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp262_ = g_settings_get_int (_tmp261_, "jpeg-quality");
+	_g_object_unref0 (self->priv->text_toolbar_menuitem);
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_quality (self, _tmp262_);
+	self->priv->text_toolbar_menuitem = _tmp65_;
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = self->priv->builder;
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp67_ = gtk_builder_get_object (_tmp66_, "text_menuitem");
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->text_menu_menuitem);
+#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->text_menu_menuitem = _tmp68_;
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp263_ = self->priv->settings;
+	_tmp69_ = self->priv->builder;
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp264_ = g_settings_get_string (_tmp263_, "selected-device");
+	_tmp70_ = gtk_builder_get_object (_tmp69_, "photo_toolbutton_menuitem");
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	device = _tmp264_;
+	_tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_toolbar_menuitem = _tmp71_;
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp265_ = device;
+	_tmp72_ = self->priv->builder;
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp265_ != NULL) {
-#line 7584 "ui.c"
-		const gchar* _tmp266_;
-		GtkTreeIter _tmp267_ = {0};
-		gboolean _tmp268_ = FALSE;
+	_tmp73_ = gtk_builder_get_object (_tmp72_, "photo_menuitem");
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_menu_menuitem);
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_menu_menuitem = _tmp74_;
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp75_ = self->priv->builder;
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp266_ = device;
+	_tmp76_ = gtk_builder_get_object (_tmp75_, "authorize_dialog");
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp268_ = user_interface_find_scan_device (self, _tmp266_, &_tmp267_);
+	_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GTK_TYPE_DIALOG, GtkDialog));
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp267_;
+	_g_object_unref0 (self->priv->authorize_dialog);
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp268_) {
-#line 7596 "ui.c"
-			GtkComboBox* _tmp269_;
-			GtkTreeIter _tmp270_;
+	self->priv->authorize_dialog = _tmp77_;
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp269_ = self->priv->device_combo;
+	_tmp78_ = self->priv->builder;
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp270_ = iter;
+	_tmp79_ = gtk_builder_get_object (_tmp78_, "authorize_label");
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active_iter (_tmp269_, &_tmp270_);
-#line 7605 "ui.c"
-		}
-	}
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp271_ = self->priv->settings;
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp272_ = g_settings_get_string (_tmp271_, "document-type");
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp272_;
+	_tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GTK_TYPE_LABEL, GtkLabel));
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->authorize_label);
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->authorize_label = _tmp80_;
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp81_ = self->priv->builder;
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp82_ = gtk_builder_get_object (_tmp81_, "username_entry");
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GTK_TYPE_ENTRY, GtkEntry));
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->username_entry);
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->username_entry = _tmp83_;
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp84_ = self->priv->builder;
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp85_ = gtk_builder_get_object (_tmp84_, "password_entry");
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GTK_TYPE_ENTRY, GtkEntry));
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->password_entry);
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->password_entry = _tmp86_;
+#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp87_ = self->priv->builder;
 #line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp273_ = document_type;
+	_tmp88_ = gtk_builder_get_object (_tmp87_, "preferences_dialog");
 #line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp273_ != NULL) {
-#line 7618 "ui.c"
-		const gchar* _tmp274_;
+	_tmp89_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GTK_TYPE_DIALOG, GtkDialog));
+#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->preferences_dialog);
+#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->preferences_dialog = _tmp89_;
 #line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp274_ = document_type;
+	_tmp90_ = self->priv->builder;
 #line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp274_);
-#line 7624 "ui.c"
-	}
+	_tmp91_ = gtk_builder_get_object (_tmp90_, "device_combo");
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->device_combo);
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->device_combo = _tmp92_;
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp93_ = self->priv->device_combo;
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp94_ = gtk_combo_box_get_model (_tmp93_);
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp95_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->device_model);
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->device_model = _tmp95_;
 #line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp275_ = self->priv->book;
+	_tmp96_ = self->priv->builder;
 #line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp276_ = book_view_new (_tmp275_);
+	_tmp97_ = gtk_builder_get_object (_tmp96_, "text_dpi_combo");
 #line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp276_);
+	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GTK_TYPE_COMBO_BOX, GtkComboBox));
 #line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->book_view);
+	_g_object_unref0 (self->priv->text_dpi_combo);
 #line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_view = _tmp276_;
+	self->priv->text_dpi_combo = _tmp98_;
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp99_ = self->priv->text_dpi_combo;
 #line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp277_ = self->priv->book_view;
+	_tmp100_ = gtk_combo_box_get_model (_tmp99_);
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->text_dpi_model);
 #line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp277_, (guint) 18);
+	self->priv->text_dpi_model = _tmp101_;
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp278_ = self->priv->main_vbox;
+	_tmp102_ = self->priv->builder;
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp279_ = self->priv->book_view;
+	_tmp103_ = gtk_builder_get_object (_tmp102_, "photo_dpi_combo");
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end ((GtkBox*) _tmp278_, (GtkWidget*) _tmp279_, TRUE, TRUE, (guint) 0);
+	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_dpi_combo);
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_dpi_combo = _tmp104_;
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp105_ = self->priv->photo_dpi_combo;
 #line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp280_ = self->priv->book_view;
+	_tmp106_ = gtk_combo_box_get_model (_tmp105_);
 #line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp280_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self);
+	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_dpi_model);
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_dpi_model = _tmp107_;
+#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp108_ = self->priv->builder;
 #line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp281_ = self->priv->book_view;
+	_tmp109_ = gtk_builder_get_object (_tmp108_, "page_side_combo");
 #line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp281_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self);
+	_tmp110_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->page_side_combo);
+#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->page_side_combo = _tmp110_;
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp111_ = self->priv->page_side_combo;
 #line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp282_ = self->priv->book_view;
+	_tmp112_ = gtk_combo_box_get_model (_tmp111_);
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->page_side_model);
 #line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp282_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self);
+	self->priv->page_side_model = _tmp113_;
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp283_ = self->priv->book_view;
+	_tmp114_ = self->priv->builder;
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp283_);
+	_tmp115_ = gtk_builder_get_object (_tmp114_, "paper_size_combo");
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp116_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->paper_size_combo);
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->paper_size_combo = _tmp116_;
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp117_ = self->priv->paper_size_combo;
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp118_ = gtk_combo_box_get_model (_tmp117_);
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp119_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->paper_size_model);
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->paper_size_model = _tmp119_;
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp120_ = self->priv->builder;
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp121_ = gtk_builder_get_object (_tmp120_, "brightness_scale");
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp122_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GTK_TYPE_SCALE, GtkScale));
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->brightness_scale);
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->brightness_scale = _tmp122_;
 #line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp284_ = self->priv->settings;
+	_tmp123_ = self->priv->brightness_scale;
 #line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp285_ = g_settings_get_enum (_tmp284_, "scan-direction");
+	_tmp124_ = gtk_range_get_adjustment ((GtkRange*) _tmp123_);
 #line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_scan_direction = (ScanDirection) _tmp285_;
+	_tmp125_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->brightness_adjustment);
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->brightness_adjustment = _tmp125_;
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp286_ = self->priv->settings;
+	_tmp126_ = self->priv->builder;
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp287_ = g_settings_get_int (_tmp286_, "page-width");
+	_tmp127_ = gtk_builder_get_object (_tmp126_, "contrast_scale");
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_width = _tmp287_;
+	_tmp128_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, GTK_TYPE_SCALE, GtkScale));
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->contrast_scale);
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->contrast_scale = _tmp128_;
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp129_ = self->priv->contrast_scale;
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp130_ = gtk_range_get_adjustment ((GtkRange*) _tmp129_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp288_ = self->priv->default_page_width;
+	_tmp131_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp288_ <= 0) {
+	_g_object_unref0 (self->priv->contrast_adjustment);
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->contrast_adjustment = _tmp131_;
 #line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->default_page_width = 595;
-#line 7680 "ui.c"
-	}
+	_tmp132_ = self->priv->builder;
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp133_ = gtk_builder_get_object (_tmp132_, "quality_scale");
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp134_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GTK_TYPE_SCALE, GtkScale));
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->quality_scale);
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->quality_scale = _tmp134_;
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp289_ = self->priv->settings;
+	_tmp135_ = self->priv->quality_scale;
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp290_ = g_settings_get_int (_tmp289_, "page-height");
+	_tmp136_ = gtk_range_get_adjustment ((GtkRange*) _tmp135_);
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_height = _tmp290_;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp291_ = self->priv->default_page_height;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp291_ <= 0) {
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->default_page_height = 842;
-#line 7694 "ui.c"
-	}
+	_tmp137_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->quality_adjustment);
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->quality_adjustment = _tmp137_;
 #line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp292_ = self->priv->settings;
+	_tmp138_ = (GtkInfoBar*) gtk_info_bar_new ();
 #line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp293_ = g_settings_get_int (_tmp292_, "page-dpi");
+	g_object_ref_sink (_tmp138_);
 #line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_dpi = _tmp293_;
+	_g_object_unref0 (self->priv->info_bar);
+#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar = _tmp138_;
 #line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp294_ = self->priv->default_page_dpi;
+	_tmp139_ = self->priv->info_bar;
 #line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp294_ <= 0) {
+	g_signal_connect (_tmp139_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self);
 #line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->default_page_dpi = 72;
-#line 7708 "ui.c"
-	}
+	_tmp140_ = self->priv->main_vbox;
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp141_ = self->priv->info_bar;
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp140_, (GtkWidget*) _tmp141_, FALSE, TRUE, (guint) 0);
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp142_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp142_);
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	hbox = _tmp142_;
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp143_ = self->priv->info_bar;
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp144_ = gtk_info_bar_get_content_area (_tmp143_);
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp145_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, GTK_TYPE_CONTAINER, GtkContainer));
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	content_area = _tmp145_;
 #line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp295_ = self->priv->settings;
+	_tmp146_ = content_area;
 #line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp296_ = g_settings_get_int (_tmp295_, "window-width");
+	_tmp147_ = hbox;
 #line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_width = _tmp296_;
+	gtk_container_add (_tmp146_, (GtkWidget*) _tmp147_);
 #line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp297_ = self->priv->window_width;
+	_tmp148_ = hbox;
 #line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp297_ <= 0) {
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_width = 600;
-#line 7722 "ui.c"
-	}
+	gtk_widget_show ((GtkWidget*) _tmp148_);
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp298_ = self->priv->settings;
+	_tmp149_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp299_ = g_settings_get_int (_tmp298_, "window-height");
+	g_object_ref_sink (_tmp149_);
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_height = _tmp299_;
+	_g_object_unref0 (self->priv->info_bar_image);
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_image = _tmp149_;
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp150_ = hbox;
 #line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp300_ = self->priv->window_height;
+	_tmp151_ = self->priv->info_bar_image;
 #line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp300_ <= 0) {
+	gtk_box_pack_start (_tmp150_, (GtkWidget*) _tmp151_, FALSE, TRUE, (guint) 0);
 #line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_height = 400;
-#line 7736 "ui.c"
-	}
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp301_ = self->priv->window_width;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp302_ = self->priv->window_height;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1513: Restoring window to %dx%d pixels", _tmp301_, _tmp302_);
+	_tmp152_ = self->priv->info_bar_image;
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp152_);
 #line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp303_ = self->priv->window;
+	_tmp153_ = (GtkLabel*) gtk_label_new (NULL);
 #line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp304_ = self->priv->window_width;
+	g_object_ref_sink (_tmp153_);
 #line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp305_ = self->priv->window_height;
+	_g_object_unref0 (self->priv->info_bar_label);
 #line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size (_tmp303_, _tmp304_, _tmp305_);
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp306_ = self->priv->settings;
+	self->priv->info_bar_label = _tmp153_;
 #line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp307_ = g_settings_get_boolean (_tmp306_, "window-is-maximized");
+	_tmp154_ = self->priv->info_bar_label;
 #line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window_is_maximized = _tmp307_;
+	gtk_misc_set_alignment ((GtkMisc*) _tmp154_, 0.0f, 0.5f);
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp155_ = hbox;
 #line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp308_ = self->priv->window_is_maximized;
+	_tmp156_ = self->priv->info_bar_label;
 #line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp308_) {
-#line 7762 "ui.c"
-		GtkWindow* _tmp309_;
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1518: Restoring window to maximized");
+	gtk_box_pack_start (_tmp155_, (GtkWidget*) _tmp156_, TRUE, TRUE, (guint) 0);
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp157_ = self->priv->info_bar_label;
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp157_);
 #line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp309_ = self->priv->window;
+	_tmp158_ = self->priv->info_bar;
 #line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_maximize (_tmp309_);
-#line 7770 "ui.c"
-	}
-#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp310_ = self->priv->book;
-#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp311_ = book_get_n_pages (_tmp310_);
-#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp311_ == ((guint) 0)) {
-#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_add_default_page (self);
-#line 7780 "ui.c"
-	}
+	_tmp159_ = _ ("_Close");
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp160_ = gtk_info_bar_add_button (_tmp158_, _tmp159_, (gint) GTK_RESPONSE_CLOSE);
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp161_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GTK_TYPE_BUTTON, GtkButton));
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_close_button);
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_close_button = _tmp161_;
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp162_ = self->priv->info_bar;
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp163_ = _ ("Change _Scanner");
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp164_ = gtk_info_bar_add_button (_tmp162_, _tmp163_, 1);
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp165_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp164_, GTK_TYPE_BUTTON, GtkButton));
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_change_scanner_button = _tmp165_;
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp166_ = self->priv->paper_size_model;
 #line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp312_ = self->priv->book;
+	gtk_list_store_append (_tmp166_, &_tmp167_);
 #line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp312_, FALSE);
+	iter = _tmp167_;
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp313_ = self->priv->book;
+	_tmp168_ = self->priv->paper_size_model;
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp313_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp169_ = iter;
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp170_ = _ ("Automatic");
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp168_, &_tmp169_, 0, 0, 1, 0, 2, _tmp170_, -1, -1);
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp171_ = self->priv->paper_size_model;
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp171_, &_tmp172_);
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp172_;
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp173_ = self->priv->paper_size_model;
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp174_ = iter;
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp173_, &_tmp174_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp175_ = self->priv->paper_size_model;
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp175_, &_tmp176_);
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp176_;
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp177_ = self->priv->paper_size_model;
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp178_ = iter;
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp177_, &_tmp178_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp179_ = self->priv->paper_size_model;
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp179_, &_tmp180_);
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp180_;
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp181_ = self->priv->paper_size_model;
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp182_ = iter;
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp181_, &_tmp182_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp183_ = self->priv->paper_size_model;
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp183_, &_tmp184_);
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp184_;
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp185_ = self->priv->paper_size_model;
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp186_ = iter;
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp185_, &_tmp186_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp187_ = self->priv->paper_size_model;
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp187_, &_tmp188_);
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp188_;
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp189_ = self->priv->paper_size_model;
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp190_ = iter;
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp189_, &_tmp190_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp191_ = self->priv->paper_size_model;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp191_, &_tmp192_);
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp192_;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp193_ = self->priv->paper_size_model;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp194_ = iter;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp193_, &_tmp194_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp195_ = self->priv->settings;
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp196_ = g_settings_get_int (_tmp195_, "text-dpi");
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp196_;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp197_ = dpi;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp197_ <= 0) {
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
+#line 7746 "ui.c"
+	}
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp198_ = self->priv->text_dpi_combo;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp199_ = dpi;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp198_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp199_);
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp200_ = self->priv->text_dpi_combo;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp200_, "changed", (GCallback) ___lambda4__gtk_combo_box_changed, self);
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp201_ = self->priv->settings;
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp202_ = g_settings_get_int (_tmp201_, "photo-dpi");
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp202_;
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp203_ = dpi;
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp203_ <= 0) {
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
+#line 7770 "ui.c"
+	}
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp204_ = self->priv->photo_dpi_combo;
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp205_ = dpi;
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp204_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp205_);
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp206_ = self->priv->photo_dpi_combo;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp206_, "changed", (GCallback) ___lambda5__gtk_combo_box_changed, self);
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp207_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp207_);
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp207_;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp208_ = self->priv->device_combo;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp209_ = renderer;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp208_, (GtkCellRenderer*) _tmp209_, TRUE);
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp210_ = self->priv->device_combo;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp211_ = renderer;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp210_, (GtkCellRenderer*) _tmp211_, "text", 1);
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp212_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp212_);
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (renderer);
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp212_;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp213_ = self->priv->page_side_combo;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp214_ = renderer;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp213_, (GtkCellRenderer*) _tmp214_, TRUE);
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp215_ = self->priv->page_side_combo;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp216_ = renderer;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp215_, (GtkCellRenderer*) _tmp216_, "text", 1);
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp217_ = self->priv->settings;
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp218_ = g_settings_get_enum (_tmp217_, "page-side");
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_page_side (self, (ScanType) _tmp218_);
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp219_ = self->priv->page_side_combo;
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp219_, "changed", (GCallback) ___lambda6__gtk_combo_box_changed, self);
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp220_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp220_);
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (renderer);
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp220_;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp221_ = self->priv->paper_size_combo;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp222_ = renderer;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp221_, (GtkCellRenderer*) _tmp222_, TRUE);
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp223_ = self->priv->paper_size_combo;
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp224_ = renderer;
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp223_, (GtkCellRenderer*) _tmp224_, "text", 2);
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp225_ = self->priv->settings;
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp226_ = g_settings_get_int (_tmp225_, "paper-width");
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_width = _tmp226_;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp227_ = self->priv->settings;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp228_ = g_settings_get_int (_tmp227_, "paper-height");
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_height = _tmp228_;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp229_ = paper_width;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp230_ = paper_height;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_paper_size (self, _tmp229_, _tmp230_);
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp231_ = self->priv->paper_size_combo;
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp231_, "changed", (GCallback) ___lambda7__gtk_combo_box_changed, self);
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp232_ = self->priv->brightness_adjustment;
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp233_ = gtk_adjustment_get_lower (_tmp232_);
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp233_;
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp234_ = _ ("Darker");
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp235_ = g_strdup_printf ("<small>%s</small>", _tmp234_);
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	darker_label = _tmp235_;
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp236_ = self->priv->brightness_adjustment;
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp237_ = gtk_adjustment_get_upper (_tmp236_);
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp237_;
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = _ ("Lighter");
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp239_ = g_strdup_printf ("<small>%s</small>", _tmp238_);
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lighter_label = _tmp239_;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp240_ = self->priv->brightness_scale;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp241_ = lower;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp242_ = darker_label;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp240_, _tmp241_, GTK_POS_BOTTOM, _tmp242_);
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp243_ = self->priv->brightness_scale;
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp243_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp244_ = self->priv->brightness_scale;
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp245_ = upper;
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp246_ = lighter_label;
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp244_, _tmp245_, GTK_POS_BOTTOM, _tmp246_);
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp247_ = self->priv->settings;
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp248_ = g_settings_get_int (_tmp247_, "brightness");
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_brightness (self, _tmp248_);
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp249_ = self->priv->brightness_adjustment;
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp249_, "value-changed", (GCallback) ___lambda8__gtk_adjustment_value_changed, self);
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp250_ = self->priv->contrast_adjustment;
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp251_ = gtk_adjustment_get_lower (_tmp250_);
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp251_;
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp252_ = _ ("Less");
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp253_ = g_strdup_printf ("<small>%s</small>", _tmp252_);
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	less_label = _tmp253_;
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp254_ = self->priv->contrast_adjustment;
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp255_ = gtk_adjustment_get_upper (_tmp254_);
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp255_;
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp256_ = _ ("More");
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp257_ = g_strdup_printf ("<small>%s</small>", _tmp256_);
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	more_label = _tmp257_;
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp258_ = self->priv->contrast_scale;
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp259_ = lower;
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp260_ = less_label;
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp258_, _tmp259_, GTK_POS_BOTTOM, _tmp260_);
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp261_ = self->priv->contrast_scale;
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp261_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp262_ = self->priv->contrast_scale;
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp263_ = upper;
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp264_ = more_label;
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp262_, _tmp263_, GTK_POS_BOTTOM, _tmp264_);
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp265_ = self->priv->settings;
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp266_ = g_settings_get_int (_tmp265_, "contrast");
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_contrast (self, _tmp266_);
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp267_ = self->priv->contrast_adjustment;
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp267_, "value-changed", (GCallback) ___lambda9__gtk_adjustment_value_changed, self);
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp268_ = self->priv->quality_adjustment;
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp269_ = gtk_adjustment_get_lower (_tmp268_);
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp269_;
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp270_ = _ ("Minimum");
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp271_ = g_strdup_printf ("<small>%s</small>", _tmp270_);
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	minimum_label = _tmp271_;
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp272_ = self->priv->quality_adjustment;
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp273_ = gtk_adjustment_get_upper (_tmp272_);
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp273_;
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp274_ = _ ("Maximum");
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp275_ = g_strdup_printf ("<small>%s</small>", _tmp274_);
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	maximum_label = _tmp275_;
+#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp276_ = self->priv->quality_scale;
+#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp277_ = lower;
+#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp278_ = minimum_label;
+#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp276_, _tmp277_, GTK_POS_BOTTOM, _tmp278_);
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp279_ = self->priv->quality_scale;
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp279_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp280_ = self->priv->quality_scale;
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp281_ = upper;
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp282_ = maximum_label;
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp280_, _tmp281_, GTK_POS_BOTTOM, _tmp282_);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp283_ = self->priv->settings;
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp284_ = g_settings_get_int (_tmp283_, "jpeg-quality");
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_quality (self, _tmp284_);
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp285_ = self->priv->quality_adjustment;
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp285_, "value-changed", (GCallback) ___lambda10__gtk_adjustment_value_changed, self);
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp286_ = self->priv->settings;
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp287_ = g_settings_get_string (_tmp286_, "selected-device");
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	device = _tmp287_;
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp288_ = device;
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp288_ != NULL) {
+#line 8044 "ui.c"
+		const gchar* _tmp289_ = NULL;
+		GtkTreeIter _tmp290_ = {0};
+		gboolean _tmp291_ = FALSE;
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp289_ = device;
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp291_ = user_interface_find_scan_device (self, _tmp289_, &_tmp290_);
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		iter = _tmp290_;
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp291_) {
+#line 8056 "ui.c"
+			GtkComboBox* _tmp292_ = NULL;
+			GtkTreeIter _tmp293_ = {0};
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp292_ = self->priv->device_combo;
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp293_ = iter;
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_combo_box_set_active_iter (_tmp292_, &_tmp293_);
+#line 8065 "ui.c"
+		}
+	}
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp294_ = self->priv->settings;
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp295_ = g_settings_get_string (_tmp294_, "document-type");
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	document_type = _tmp295_;
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp296_ = document_type;
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp296_ != NULL) {
+#line 8078 "ui.c"
+		const gchar* _tmp297_ = NULL;
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp297_ = document_type;
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_document_hint (self, _tmp297_, FALSE);
+#line 8084 "ui.c"
+	}
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp298_ = self->priv->_book;
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp299_ = book_view_new (_tmp298_);
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp299_);
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->book_view);
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_view = _tmp299_;
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp300_ = self->priv->book_view;
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _tmp300_, (guint) 18);
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp301_ = self->priv->main_vbox;
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp302_ = self->priv->book_view;
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_end (_tmp301_, (GtkWidget*) _tmp302_, TRUE, TRUE, (guint) 0);
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp303_ = self->priv->book_view;
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp303_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self);
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp304_ = self->priv->book_view;
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp304_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self);
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp305_ = self->priv->book_view;
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp305_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self);
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp306_ = self->priv->book_view;
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp306_);
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_load_state (self);
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp307_ = self->priv->window_width;
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp308_ = self->priv->window_height;
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1629: Restoring window to %dx%d pixels", _tmp307_, _tmp308_);
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp309_ = self->priv->window;
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp310_ = self->priv->window_width;
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp311_ = self->priv->window_height;
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_default_size ((GtkWindow*) _tmp309_, _tmp310_, _tmp311_);
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp312_ = self->priv->window_is_maximized;
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp312_) {
+#line 8142 "ui.c"
+		GtkApplicationWindow* _tmp313_ = NULL;
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:1633: Restoring window to maximized");
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp313_ = self->priv->window;
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_maximize ((GtkWindow*) _tmp313_);
+#line 8150 "ui.c"
+	}
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp314_ = self->priv->window;
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp315_ = _ ("Saving document...");
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp316_ = progress_bar_dialog_new (_tmp314_, _tmp315_);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp316_);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->progress_dialog = _tmp316_;
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp317_ = self->priv->book;
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp317_ = self->priv->_book;
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect (_tmp317_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 7830 "ui.c"
+#line 8192 "ui.c"
+}
+
+
+static void user_interface_load_state (UserInterface* self) {
+	gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	GKeyFile* f = NULL;
+	GKeyFile* _tmp3_ = NULL;
+	GKeyFile* _tmp11_ = NULL;
+	gint _tmp12_ = 0;
+	gint _tmp13_ = 0;
+	GKeyFile* _tmp14_ = NULL;
+	gint _tmp15_ = 0;
+	gint _tmp16_ = 0;
+	GKeyFile* _tmp17_ = NULL;
+	gboolean _tmp18_ = FALSE;
+	GKeyFile* _tmp19_ = NULL;
+	gint _tmp20_ = 0;
+	GKeyFile* _tmp21_ = NULL;
+	gint _tmp22_ = 0;
+	GKeyFile* _tmp23_ = NULL;
+	gint _tmp24_ = 0;
+	GKeyFile* _tmp25_ = NULL;
+	gchar* _tmp26_ = NULL;
+	gchar* _tmp27_ = NULL;
+	GQuark _tmp29_ = 0U;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp28_label0 = 0;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp28_label1 = 0;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp28_label2 = 0;
+#line 8226 "ui.c"
+	GError * _inner_error_ = NULL;
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = user_interface_get_state_filename (self);
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _tmp0_;
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1648: Loading state from %s", _tmp2_);
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp2_);
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = g_key_file_new ();
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	f = _tmp3_;
+#line 8244 "ui.c"
+	{
+		GKeyFile* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = f;
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = user_interface_get_state_filename (self);
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = _tmp5_;
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = _tmp6_;
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp7_);
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_inner_error_ != NULL) {
+#line 8264 "ui.c"
+			goto __catch22_g_error;
+		}
+	}
+	goto __finally22;
+	__catch22_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp8_ = NULL;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		e = _inner_error_;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = e;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+#line 8281 "ui.c"
+			GError* _tmp9_ = NULL;
+			const gchar* _tmp10_ = NULL;
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp9_ = e;
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp10_ = _tmp9_->message;
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:1658: Failed to load state: %s", _tmp10_);
+#line 8290 "ui.c"
+		}
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_error_free0 (e);
+#line 8294 "ui.c"
+	}
+	__finally22:
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_inner_error_ != NULL) {
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_key_file_unref0 (f);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_clear_error (&_inner_error_);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 8307 "ui.c"
+	}
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = f;
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_width = _tmp12_;
+#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = self->priv->window_width;
+#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp13_ <= 0) {
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->window_width = 600;
+#line 8321 "ui.c"
+	}
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = f;
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_height = _tmp15_;
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = self->priv->window_height;
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp16_ <= 0) {
+#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->window_height = 400;
+#line 8335 "ui.c"
+	}
+#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = f;
+#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
+#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_is_maximized = _tmp18_;
+#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = f;
+#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
+#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_width = _tmp20_;
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = f;
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_height = _tmp22_;
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = f;
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_dpi = _tmp24_;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = f;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = user_interface_state_get_string (self, _tmp25_, "last-page", "scan-direction", "top-to-bottom");
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = _tmp26_;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_free (_tmp27_);
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 8375 "ui.c"
+			default:
+			{
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 8382 "ui.c"
+			}
+		}
+	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 8388 "ui.c"
+			default:
+			{
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 8395 "ui.c"
+			}
+		}
+	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 8401 "ui.c"
+			default:
+			{
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 8408 "ui.c"
+			}
+		}
+	} else {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 8414 "ui.c"
+			default:
+			{
+#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 8421 "ui.c"
+			}
+		}
+	}
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_key_file_unref0 (f);
+#line 8427 "ui.c"
+}
+
+
+static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_) {
+	gint result = 0;
+	GError * _inner_error_ = NULL;
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (f != NULL, 0);
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (group_name != NULL, 0);
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (key != NULL, 0);
+#line 8442 "ui.c"
+	{
+		gint _tmp0_ = 0;
+		GKeyFile* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gint _tmp4_ = 0;
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = f;
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = group_name;
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = key;
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = _tmp4_;
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_inner_error_ != NULL) {
+#line 8461 "ui.c"
+			goto __catch23_g_error;
+		}
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp0_;
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 8468 "ui.c"
+	}
+	goto __finally23;
+	__catch23_g_error:
+	{
+		gint _tmp5_ = 0;
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_clear_error (&_inner_error_);
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _default_;
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp5_;
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 8484 "ui.c"
+	}
+	__finally23:
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_clear_error (&_inner_error_);
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return 0;
+#line 8493 "ui.c"
+}
+
+
+static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_) {
+	gboolean result = FALSE;
+	GError * _inner_error_ = NULL;
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (f != NULL, FALSE);
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (group_name != NULL, FALSE);
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (key != NULL, FALSE);
+#line 8508 "ui.c"
+	{
+		gboolean _tmp0_ = FALSE;
+		GKeyFile* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gboolean _tmp4_ = FALSE;
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = f;
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = group_name;
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = key;
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = _tmp4_;
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_inner_error_ != NULL) {
+#line 8527 "ui.c"
+			goto __catch24_g_error;
+		}
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp0_;
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 8534 "ui.c"
+	}
+	goto __finally24;
+	__catch24_g_error:
+	{
+		gboolean _tmp5_ = FALSE;
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_clear_error (&_inner_error_);
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _default_;
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp5_;
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 8550 "ui.c"
+	}
+	__finally24:
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_clear_error (&_inner_error_);
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return FALSE;
+#line 8559 "ui.c"
+}
+
+
+static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_) {
+	gchar* result = NULL;
+	GError * _inner_error_ = NULL;
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (f != NULL, NULL);
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (group_name != NULL, NULL);
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (key != NULL, NULL);
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (_default_ != NULL, NULL);
+#line 8576 "ui.c"
+	{
+		gchar* _tmp0_ = NULL;
+		GKeyFile* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		gchar* _tmp4_ = NULL;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = f;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = group_name;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = key;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = _tmp4_;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_inner_error_ != NULL) {
+#line 8595 "ui.c"
+			goto __catch25_g_error;
+		}
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp0_;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 8602 "ui.c"
+	}
+	goto __finally25;
+	__catch25_g_error:
+	{
+		const gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_clear_error (&_inner_error_);
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _default_;
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = g_strdup (_tmp5_);
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp6_;
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 8621 "ui.c"
+	}
+	__finally25:
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_clear_error (&_inner_error_);
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return NULL;
+#line 8630 "ui.c"
 }
 
 
 static gboolean ___lambda3_ (UserInterface* self) {
 	gboolean result = FALSE;
-	ProgressBarDialog* _tmp0_;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->progress_dialog;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_hide ((GtkWidget*) _tmp0_);
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_state (self, TRUE);
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_state_timeout = (guint) 0;
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7845 "ui.c"
+#line 8644 "ui.c"
 }
 
 
 static gboolean ____lambda3__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda3_ (self);
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 8653 "ui.c"
+}
+
+
+static void user_interface_save_state (UserInterface* self, gboolean force) {
+	gboolean _tmp0_ = FALSE;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	GKeyFile* f = NULL;
+	GKeyFile* _tmp7_ = NULL;
+	GKeyFile* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
+	GKeyFile* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
+	GKeyFile* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	GKeyFile* _tmp14_ = NULL;
+	gint _tmp15_ = 0;
+	GKeyFile* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	GKeyFile* _tmp18_ = NULL;
+	gint _tmp19_ = 0;
+	ScanDirection _tmp20_ = 0;
+	GError * _inner_error_ = NULL;
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = force;
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp0_) {
+#line 8684 "ui.c"
+		guint _tmp1_ = 0U;
+		guint _tmp3_ = 0U;
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = self->priv->save_state_timeout;
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp1_ != ((guint) 0)) {
+#line 8691 "ui.c"
+			guint _tmp2_ = 0U;
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp2_ = self->priv->save_state_timeout;
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_source_remove (_tmp2_);
+#line 8697 "ui.c"
+		}
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda3__gsource_func, user_interface_ref (self), user_interface_unref);
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->save_state_timeout = _tmp3_;
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 8705 "ui.c"
+	}
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = user_interface_get_state_filename (self);
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _tmp4_;
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = _tmp5_;
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1739: Saving state to %s", _tmp6_);
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp6_);
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = g_key_file_new ();
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	f = _tmp7_;
+#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = f;
+#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = self->priv->window_width;
+#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = f;
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = self->priv->window_height;
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = f;
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = self->priv->window_is_maximized;
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = f;
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = self->priv->default_page_width;
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = f;
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = self->priv->default_page_height;
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = f;
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = self->priv->default_page_dpi;
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = self->priv->default_page_scan_direction;
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (_tmp20_) {
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 8763 "ui.c"
+		{
+			GKeyFile* _tmp21_ = NULL;
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp21_ = f;
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			break;
+#line 8772 "ui.c"
+		}
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 8776 "ui.c"
+		{
+			GKeyFile* _tmp22_ = NULL;
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp22_ = f;
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			break;
+#line 8785 "ui.c"
+		}
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 8789 "ui.c"
+		{
+			GKeyFile* _tmp23_ = NULL;
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp23_ = f;
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			break;
+#line 8798 "ui.c"
+		}
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 8802 "ui.c"
+		{
+			GKeyFile* _tmp24_ = NULL;
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp24_ = f;
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			break;
+#line 8811 "ui.c"
+		}
+		default:
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 8816 "ui.c"
+	}
+	{
+		gchar* _tmp25_ = NULL;
+		gchar* _tmp26_ = NULL;
+		gchar* _tmp27_ = NULL;
+		GKeyFile* _tmp28_ = NULL;
+		gchar* _tmp29_ = NULL;
+		gchar* _tmp30_ = NULL;
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp25_ = user_interface_get_state_filename (self);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp26_ = _tmp25_;
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp27_ = _tmp26_;
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp28_ = f;
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp30_ = _tmp29_;
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp30_);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp27_);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_inner_error_ != NULL) {
+#line 8845 "ui.c"
+			goto __catch26_g_error;
+		}
+	}
+	goto __finally26;
+	__catch26_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp31_ = NULL;
+		const gchar* _tmp32_ = NULL;
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		e = _inner_error_;
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp31_ = e;
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp32_ = _tmp31_->message;
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1769: Failed to write state: %s", _tmp32_);
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_error_free0 (e);
+#line 8867 "ui.c"
+	}
+	__finally26:
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_inner_error_ != NULL) {
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_key_file_unref0 (f);
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_clear_error (&_inner_error_);
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 8880 "ui.c"
+	}
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_key_file_unref0 (f);
+#line 8884 "ui.c"
+}
+
+
+static gboolean ___lambda11_ (UserInterface* self) {
+	gboolean result = FALSE;
+	ProgressBarDialog* _tmp0_ = NULL;
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->progress_dialog;
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_hide ((GtkWidget*) _tmp0_);
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = FALSE;
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7854 "ui.c"
+#line 8899 "ui.c"
+}
+
+
+static gboolean ____lambda11__gsource_func (gpointer self) {
+	gboolean result;
+	result = ___lambda11_ (self);
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 8908 "ui.c"
 }
 
 
 static void user_interface_book_saving_cb (UserInterface* self, gint page_number) {
-	Book* _tmp1_;
+	gint total = 0;
+	Book* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-	gint total;
-	gint _tmp3_;
-	gint _tmp4_;
-	gdouble fraction;
-	gdouble _tmp5_;
-	gboolean complete;
-	gboolean _tmp6_;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_;
-	gint _tmp9_;
-	gchar* _tmp10_ = NULL;
-	gchar* message;
-	ProgressBarDialog* _tmp11_;
-	gdouble _tmp12_;
-	ProgressBarDialog* _tmp13_;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	guint _tmp3_ = 0U;
+	gdouble fraction = 0.0;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	gboolean complete = FALSE;
+	gdouble _tmp6_ = 0.0;
+	gboolean _tmp7_ = FALSE;
+	gchar* message = NULL;
+	const gchar* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
+	gint _tmp10_ = 0;
+	gchar* _tmp11_ = NULL;
+	ProgressBarDialog* _tmp12_ = NULL;
+	gdouble _tmp13_ = 0.0;
+	ProgressBarDialog* _tmp14_ = NULL;
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 7880 "ui.c"
+#line 8935 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7888 "ui.c"
+#line 8943 "ui.c"
 		}
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 7892 "ui.c"
+#line 8947 "ui.c"
 	}
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = self->priv->book;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = self->priv->_book;
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	total = (gint) _tmp2_;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page_number;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = total;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	fraction = (_tmp3_ + 1.0) / _tmp4_;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = fraction;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	complete = _tmp5_ == 1.0;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = complete;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_) {
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda3__gsource_func, user_interface_ref (self), user_interface_unref);
-#line 7916 "ui.c"
-	}
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _ ("Saving page %d out of %d");
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = page_number;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = total;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = g_strdup_printf (_tmp7_, _tmp8_ + 1, _tmp9_);
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp10_;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = self->priv->progress_dialog;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = fraction;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	progress_bar_dialog_set_fraction (_tmp11_, _tmp12_);
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->progress_dialog;
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	progress_bar_dialog_set_message (_tmp13_, message);
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	total = (gint) _tmp3_;
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page_number;
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = total;
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	fraction = (_tmp4_ + 1.0) / _tmp5_;
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = fraction;
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	complete = _tmp6_ == 1.0;
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = complete;
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp7_) {
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda11__gsource_func, user_interface_ref (self), user_interface_unref);
+#line 8973 "ui.c"
+	}
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _ ("Saving page %d out of %d");
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = page_number;
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = total;
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	message = _tmp11_;
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = self->priv->progress_dialog;
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = fraction;
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = self->priv->progress_dialog;
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	progress_bar_dialog_set_message (_tmp14_, message);
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 7940 "ui.c"
+#line 8997 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
-	ProgressBarDialog* _tmp0_;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	ProgressBarDialog* _tmp0_ = NULL;
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp0_);
-#line 7952 "ui.c"
+#line 9009 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
-	ProgressBarDialog* _tmp0_;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	ProgressBarDialog* _tmp0_ = NULL;
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
-#line 7964 "ui.c"
+#line 9021 "ui.c"
 }
 
 
-static gpointer _book_ref0 (gpointer self) {
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? book_ref (self) : NULL;
-#line 7971 "ui.c"
+void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (error_title != NULL);
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (error_text != NULL);
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->have_error = TRUE;
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = error_title;
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->error_title);
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->error_title = _tmp1_;
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = error_text;
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->error_text);
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->error_text = _tmp3_;
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = change_scanner_hint;
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->error_change_scanner_hint = _tmp4_;
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_update_info_bar (self);
+#line 9061 "ui.c"
+}
+
+
+void user_interface_start (UserInterface* self) {
+	GtkApplicationWindow* _tmp0_ = NULL;
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->window;
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp0_);
+#line 9073 "ui.c"
 }
 
 
 Book* user_interface_get_book (UserInterface* self) {
-	Book* result = NULL;
-	Book* _tmp0_;
-	Book* _tmp1_;
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Book* result;
+	Book* _tmp0_ = NULL;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _book_ref0 (_tmp0_);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp1_;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp0_;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7989 "ui.c"
+#line 9088 "ui.c"
 }
 
 
-void user_interface_set_selected_page (UserInterface* self, Page* page) {
-	BookView* _tmp0_;
-	Page* _tmp1_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static gpointer _book_ref0 (gpointer self) {
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return self ? book_ref (self) : NULL;
+#line 9095 "ui.c"
+}
+
+
+static void user_interface_set_book (UserInterface* self, Book* value) {
+	Book* _tmp0_ = NULL;
+	Book* _tmp1_ = NULL;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (page != NULL);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book_view;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = page;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_view_select_page (_tmp0_, _tmp1_);
-#line 8006 "ui.c"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = value;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _book_ref0 (_tmp0_);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_book_unref0 (self->priv->_book);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->_book = _tmp1_;
+#line 9112 "ui.c"
 }
 
 
 Page* user_interface_get_selected_page (UserInterface* self) {
-	Page* result = NULL;
-	BookView* _tmp0_;
+	Page* result;
+	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Page* _tmp2_ = NULL;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = book_view_get_selected (_tmp0_);
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp1_;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected_page (_tmp0_);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp2_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8024 "ui.c"
+#line 9133 "ui.c"
 }
 
 
-void user_interface_set_scanning (UserInterface* self, gboolean scanning) {
-	gboolean _tmp0_;
-	GtkMenuItem* _tmp1_;
-	gboolean _tmp2_;
-	GtkMenuItem* _tmp3_;
-	gboolean _tmp4_;
-	GtkToolButton* _tmp5_;
-	gboolean _tmp6_;
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+void user_interface_set_selected_page (UserInterface* self, Page* value) {
+	BookView* _tmp0_ = NULL;
+	Page* _tmp1_ = NULL;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = scanning;
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->scanning = _tmp0_;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->book_view;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = value;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_view_set_selected_page (_tmp0_, _tmp1_);
+#line 9148 "ui.c"
+}
+
+
+const gchar* user_interface_get_default_file_name (UserInterface* self) {
+	const gchar* result;
+	const gchar* _tmp0_ = NULL;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_default_file_name;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp0_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9163 "ui.c"
+}
+
+
+void user_interface_set_default_file_name (UserInterface* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = value;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->_default_file_name);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->_default_file_name = _tmp1_;
+#line 9180 "ui.c"
+}
+
+
+gboolean user_interface_get_scanning (UserInterface* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->scanning_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp0_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9195 "ui.c"
+}
+
+
+void user_interface_set_scanning (UserInterface* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+	GtkMenuItem* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	GtkMenuItem* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	GtkToolButton* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = value;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->scanning_ = _tmp0_;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->page_delete_menuitem;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = scanning;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = value;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->stop_menuitem;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = scanning;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = value;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->stop_toolbutton;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = scanning;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = value;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
-#line 8060 "ui.c"
+#line 9231 "ui.c"
 }
 
 
-void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gboolean _tmp4_;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+gint user_interface_get_brightness (UserInterface* self) {
+	gint result;
+	GtkAdjustment* _tmp0_ = NULL;
+	gdouble _tmp1_ = 0.0;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->brightness_adjustment;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp1_;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9249 "ui.c"
+}
+
+
+void user_interface_set_brightness (UserInterface* self, gint value) {
+	GtkAdjustment* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_title != NULL);
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_text != NULL);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->have_error = TRUE;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = error_title;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->error_title);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->error_title = _tmp1_;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = error_text;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->error_text);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->error_text = _tmp3_;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = change_scanner_hint;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->error_change_scanner_hint = _tmp4_;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_info_bar (self);
-#line 8100 "ui.c"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->brightness_adjustment;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = value;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 9264 "ui.c"
 }
 
 
-void user_interface_start (UserInterface* self) {
-	GtkWindow* _tmp0_;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+gint user_interface_get_contrast (UserInterface* self) {
+	gint result;
+	GtkAdjustment* _tmp0_ = NULL;
+	gdouble _tmp1_ = 0.0;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->contrast_adjustment;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp1_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9282 "ui.c"
+}
+
+
+void user_interface_set_contrast (UserInterface* self, gint value) {
+	GtkAdjustment* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->window;
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp0_);
-#line 8112 "ui.c"
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->contrast_adjustment;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = value;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 9297 "ui.c"
+}
+
+
+gint user_interface_get_quality (UserInterface* self) {
+	gint result;
+	GtkAdjustment* _tmp0_ = NULL;
+	gdouble _tmp1_ = 0.0;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->quality_adjustment;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp1_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9315 "ui.c"
+}
+
+
+void user_interface_set_quality (UserInterface* self, gint value) {
+	GtkAdjustment* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->quality_adjustment;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = value;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 9330 "ui.c"
+}
+
+
+gchar* user_interface_get_selected_device (UserInterface* self) {
+	gchar* result;
+	GtkTreeIter iter = {0};
+	GtkComboBox* _tmp0_ = NULL;
+	GtkTreeIter _tmp1_ = {0};
+	gboolean _tmp2_ = FALSE;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->device_combo;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp1_;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 9350 "ui.c"
+		gchar* device = NULL;
+		GtkListStore* _tmp3_ = NULL;
+		GtkTreeIter _tmp4_ = {0};
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = self->priv->device_model;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = iter;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = device;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 9364 "ui.c"
+	}
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = NULL;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9370 "ui.c"
+}
+
+
+void user_interface_set_selected_device (UserInterface* self, const gchar* value) {
+	GtkTreeIter iter = {0};
+	const gchar* _tmp0_ = NULL;
+	GtkTreeIter _tmp1_ = {0};
+	gboolean _tmp2_ = FALSE;
+	GtkComboBox* _tmp3_ = NULL;
+	GtkTreeIter _tmp4_ = {0};
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = value;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp1_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp2_) {
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 9393 "ui.c"
+	}
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->device_combo;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = iter;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->user_selected_device = TRUE;
+#line 9403 "ui.c"
+}
+
+
+static gchar* user_interface_get_state_filename (UserInterface* self) {
+	gchar* result;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = g_get_user_cache_dir ();
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp1_;
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9421 "ui.c"
 }
 
 
@@ -8138,19 +9447,19 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 		data1 = closure->data;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8131 "ui.c"
+#line 9440 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 8137 "ui.c"
+#line 9446 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), value_get_scan_options (param_values + 2), data2);
-#line 8143 "ui.c"
+#line 9452 "ui.c"
 }
 
 
@@ -8169,26 +9478,26 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 		data1 = closure->data;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8162 "ui.c"
+#line 9471 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 8168 "ui.c"
+#line 9477 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 8174 "ui.c"
+#line 9483 "ui.c"
 }
 
 
 static void value_user_interface_init (GValue* value) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	value->data[0].v_pointer = NULL;
-#line 8181 "ui.c"
+#line 9490 "ui.c"
 }
 
 
@@ -8197,7 +9506,7 @@ static void value_user_interface_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_unref (value->data[0].v_pointer);
-#line 8190 "ui.c"
+#line 9499 "ui.c"
 	}
 }
 
@@ -8207,11 +9516,11 @@ static void value_user_interface_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dest_value->data[0].v_pointer = user_interface_ref (src_value->data[0].v_pointer);
-#line 8200 "ui.c"
+#line 9509 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8204 "ui.c"
+#line 9513 "ui.c"
 	}
 }
 
@@ -8219,37 +9528,37 @@ static void value_user_interface_copy_value (const GValue* src_value, GValue* de
 static gpointer value_user_interface_peek_pointer (const GValue* value) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return value->data[0].v_pointer;
-#line 8212 "ui.c"
+#line 9521 "ui.c"
 }
 
 
 static gchar* value_user_interface_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (collect_values[0].v_pointer) {
-#line 8219 "ui.c"
+#line 9528 "ui.c"
 		UserInterface* object;
 		object = collect_values[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8226 "ui.c"
+#line 9535 "ui.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.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 8230 "ui.c"
+#line 9539 "ui.c"
 		}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = user_interface_ref (object);
-#line 8234 "ui.c"
+#line 9543 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = NULL;
-#line 8238 "ui.c"
+#line 9547 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 8242 "ui.c"
+#line 9551 "ui.c"
 }
 
 
@@ -8260,25 +9569,25 @@ static gchar* value_user_interface_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8253 "ui.c"
+#line 9562 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*object_p = NULL;
-#line 8259 "ui.c"
+#line 9568 "ui.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8263 "ui.c"
+#line 9572 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*object_p = user_interface_ref (value->data[0].v_pointer);
-#line 8267 "ui.c"
+#line 9576 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 8271 "ui.c"
+#line 9580 "ui.c"
 }
 
 
@@ -8292,7 +9601,7 @@ GParamSpec* param_spec_user_interface (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return G_PARAM_SPEC (spec);
-#line 8285 "ui.c"
+#line 9594 "ui.c"
 }
 
 
@@ -8301,7 +9610,7 @@ gpointer value_get_user_interface (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE), NULL);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return value->data[0].v_pointer;
-#line 8294 "ui.c"
+#line 9603 "ui.c"
 }
 
 
@@ -8321,17 +9630,17 @@ void value_set_user_interface (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_ref (value->data[0].v_pointer);
-#line 8314 "ui.c"
+#line 9623 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = NULL;
-#line 8318 "ui.c"
+#line 9627 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (old) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_unref (old);
-#line 8324 "ui.c"
+#line 9633 "ui.c"
 	}
 }
 
@@ -8350,17 +9659,17 @@ void value_take_user_interface (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = v_object;
-#line 8343 "ui.c"
+#line 9652 "ui.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = NULL;
-#line 8347 "ui.c"
+#line 9656 "ui.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (old) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_unref (old);
-#line 8353 "ui.c"
+#line 9662 "ui.c"
 	}
 }
 
@@ -8378,165 +9687,169 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 	g_signal_new ("stop_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("email", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
-#line 8371 "ui.c"
+#line 9680 "ui.c"
 }
 
 
 static void user_interface_instance_init (UserInterface * self) {
-	gchar* _tmp0_;
+	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_;
+	gchar* _tmp2_ = NULL;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = USER_INTERFACE_GET_PRIVATE (self);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("photo");
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp0_;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Scanned Document.pdf");
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_file_name = _tmp2_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->scanning = FALSE;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->_default_file_name = _tmp2_;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->scanning_ = FALSE;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->ref_count = 1;
-#line 8397 "ui.c"
+#line 9706 "ui.c"
 }
 
 
 static void user_interface_finalize (UserInterface* obj) {
 	UserInterface * self;
-	Book* _tmp0_;
+	Book* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-	Book* _tmp2_;
+	Book* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_USER_INTERFACE, UserInterface);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->book;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->book;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = self->priv->_book;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 21 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->window);
-#line 22 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->app_menu);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->menubar);
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->main_vbox);
-#line 23 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 24 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 25 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 26 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 28 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 29 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 31 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_menuitem);
-#line 33 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_toolbutton);
-#line 36 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_menuitem);
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_toolbar_menuitem);
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_menu_menuitem);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_menu_menuitem);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_dialog);
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_label);
-#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->username_entry);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->password_entry);
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->preferences_dialog);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_combo);
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_combo);
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_combo);
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_scale);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_scale);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_scale);
-#line 58 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_model);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_model);
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_model);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_model);
-#line 63 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_adjustment);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (self->priv->book);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_book_unref0 (self->priv->_book);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->default_file_name);
-#line 8529 "ui.c"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->_default_file_name);
+#line 9842 "ui.c"
 }
 
 
@@ -8561,7 +9874,7 @@ gpointer user_interface_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return instance;
-#line 8554 "ui.c"
+#line 9867 "ui.c"
 }
 
 
@@ -8574,173 +9887,173 @@ void user_interface_unref (gpointer instance) {
 		USER_INTERFACE_GET_CLASS (self)->finalize (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8567 "ui.c"
+#line 9880 "ui.c"
 	}
 }
 
 
-ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkWindow* parent, const gchar* title) {
+ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicationWindow* parent, const gchar* title) {
 	ProgressBarDialog * self = NULL;
-	GtkProgressBar* _tmp0_;
-	GtkBox* _tmp1_;
-	GtkBox* hbox;
-	GtkBox* _tmp2_;
-	GtkBox* vbox;
-	GtkProgressBar* _tmp3_;
-	GtkProgressBar* _tmp4_;
-	GtkProgressBar* _tmp5_;
-	GtkProgressBar* _tmp6_;
-	const gchar* _tmp7_;
-	GtkWindow* _tmp8_;
-	GtkProgressBar* _tmp9_;
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkProgressBar* _tmp0_ = NULL;
+	GtkBox* hbox = NULL;
+	GtkBox* _tmp1_ = NULL;
+	GtkBox* vbox = NULL;
+	GtkBox* _tmp2_ = NULL;
+	GtkProgressBar* _tmp3_ = NULL;
+	GtkProgressBar* _tmp4_ = NULL;
+	GtkProgressBar* _tmp5_ = NULL;
+	GtkProgressBar* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	GtkApplicationWindow* _tmp8_ = NULL;
+	GtkProgressBar* _tmp9_ = NULL;
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) self, _tmp8_);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) hbox);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) vbox);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp9_);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 8664 "ui.c"
+#line 9977 "ui.c"
 }
 
 
-ProgressBarDialog* progress_bar_dialog_new (GtkWindow* parent, const gchar* title) {
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 8671 "ui.c"
+#line 9984 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble percent) {
-	GtkProgressBar* _tmp0_;
-	gdouble _tmp1_;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkProgressBar* _tmp0_ = NULL;
+	gdouble _tmp1_ = 0.0;
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = percent;
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 8686 "ui.c"
+#line 9999 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* message) {
-	GtkProgressBar* _tmp0_;
-	const gchar* _tmp1_;
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkProgressBar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (message != NULL);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = message;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 8703 "ui.c"
+#line 10016 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 8714 "ui.c"
+#line 10027 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 8721 "ui.c"
+#line 10034 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 8733 "ui.c"
+#line 10046 "ui.c"
 }
 
 
@@ -8758,102 +10071,102 @@ GType progress_bar_dialog_get_type (void) {
 
 gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
+	gchar* filename = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gchar* filename;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 8769 "ui.c"
+#line 10082 "ui.c"
 	{
-		const gchar* _tmp3_;
+		gint fd = 0;
+		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-		gint fd;
-		gint _tmp6_;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gint _tmp6_ = 0;
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 8788 "ui.c"
-			goto __catch22_g_error;
+#line 10101 "ui.c"
+			goto __catch27_g_error;
 		}
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 8795 "ui.c"
+#line 10108 "ui.c"
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp7_;
-		const gchar* _tmp8_;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1656: Error saving email attachment: %s", _tmp8_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1875: Error saving email attachment: %s", _tmp8_);
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8823 "ui.c"
+#line 10136 "ui.c"
 	}
-	__finally22:
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally27:
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 8838 "ui.c"
+#line 10151 "ui.c"
 	}
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8846 "ui.c"
+#line 10159 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index 075c97d..31ec151 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -14,12 +14,27 @@ public class UserInterface
     private const int DEFAULT_TEXT_DPI = 150;
     private const int DEFAULT_PHOTO_DPI = 300;
 
+    private const GLib.ActionEntry[] action_entries =
+    {
+        { "new_document", new_document_activate_cb },
+        { "save", save_document_activate_cb },
+        { "save_as", save_as_document_activate_cb },
+        { "email", email_document_activate_cb },
+        { "print", print_document_activate_cb },
+        { "preferences", preferences_activate_cb },
+        { "help", help_contents_activate_cb },
+        { "about", about_activate_cb },
+        { "quit", quit_activate_cb }
+    };
+
     private Settings settings;
 
     private Gtk.Builder builder;
 
-    private Gtk.Window window;
-    private Gtk.VBox main_vbox;
+    private Gtk.ApplicationWindow window;
+    private GLib.MenuModel app_menu;
+    private Gtk.MenuBar menubar;
+    private Gtk.Box main_vbox;
     private Gtk.InfoBar info_bar;
     private Gtk.Image info_bar_image;
     private Gtk.Label info_bar_label;
@@ -74,10 +89,22 @@ public class UserInterface
     private string error_text;
     private bool error_change_scanner_hint;
 
-    private Book book;
+    public Book book { get; private set; }
     private string? book_uri = null;
 
-    private AutosaveManager? autosave_manager;
+    public Page selected_page
+    {
+        get
+        {
+            return book_view.selected_page;
+        }
+        set
+        {
+            book_view.selected_page = value;
+        }
+    }
+
+    private AutosaveManager autosave_manager;
 
     private BookView book_view;
     private bool updating_page_menu;
@@ -88,13 +115,71 @@ public class UserInterface
 
     private string document_hint = "photo";
 
-    private string default_file_name = _("Scanned Document.pdf");
-    private bool scanning = false;
+    public string default_file_name { get; set; default = _("Scanned Document.pdf"); }
+    private bool scanning_ = false;
+    public bool scanning
+    {
+        get { return scanning_; }
+        set
+        {
+            scanning_ = value;
+            page_delete_menuitem.set_sensitive (!value);
+            stop_menuitem.set_sensitive (value);
+            stop_toolbutton.set_sensitive (value);
+        }
+    }
 
     private int window_width;
     private int window_height;
     private bool window_is_maximized;
 
+    private uint save_state_timeout;
+
+    public int brightness
+    {
+        get { return (int) brightness_adjustment.get_value (); }
+        set { brightness_adjustment.set_value (value); }
+    }
+
+    public int contrast
+    {
+        get { return (int) contrast_adjustment.get_value (); }
+        set { contrast_adjustment.set_value (value); }
+    }
+
+    public int quality
+    {
+        get { return (int) quality_adjustment.get_value (); }
+        set { quality_adjustment.set_value (value); }
+    }
+
+    public string? selected_device
+    {
+        owned get
+        {
+            Gtk.TreeIter iter;
+
+            if (device_combo.get_active_iter (out iter))
+            {
+                string device;
+                device_model.get (iter, 0, out device, -1);
+                return device;
+            }
+
+            return null;
+        }
+
+        set
+        {
+            Gtk.TreeIter iter;
+            if (!find_scan_device (value, out iter))
+                return;
+
+            device_combo.set_active_iter (iter);
+            user_selected_device = true;
+        }
+    }
+
     public signal void start_scan (string? device, ScanOptions options);
     public signal void stop_scan ();
     public signal void email (string profile, int quality);
@@ -109,7 +194,18 @@ public class UserInterface
 
         load ();
 
-        autosave_manager = AutosaveManager.create (ref book);
+        autosave_manager = new AutosaveManager ();
+        autosave_manager.book = book;
+        autosave_manager.load ();
+
+        if (book.n_pages == 0)
+        {
+            add_default_page ();
+            book.needs_saving = false;
+        }
+        else
+            book_view.selected_page = book.get_page (0);
+        book.needs_saving_changed.connect (needs_saving_cb);
     }
 
     ~UserInterface ()
@@ -143,16 +239,11 @@ public class UserInterface
                                             Gtk.MessageType.WARNING,
                                             Gtk.ButtonsType.NONE,
                                             "%s", error_title);
-        dialog.add_button (Gtk.Stock.CLOSE, 0);
+        dialog.add_button (_("_Close"), 0);
         dialog.format_secondary_text ("%s", error_text);
         dialog.destroy ();
     }
 
-    public void set_default_file_name (string default_file_name)
-    {
-        this.default_file_name = default_file_name;
-    }
-
     public void authorize (string resource, out string username, out string password)
     {
         /* Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization */
@@ -176,6 +267,8 @@ public class UserInterface
         if (setting_devices)
             return;
         user_selected_device = true;
+        if (selected_device != null)
+            settings.set_string ("selected-device", selected_device);
     }
 
     private void update_info_bar ()
@@ -188,7 +281,7 @@ public class UserInterface
         if (have_error)
         {
             type = Gtk.MessageType.ERROR;
-            image_id = Gtk.Stock.DIALOG_ERROR;
+            image_id = "dialog-error";
             title = error_title;
             text = error_text;
             show_close_button = true;
@@ -197,7 +290,7 @@ public class UserInterface
         else if (device_model.iter_n_children (null) == 0)
         {
             type = Gtk.MessageType.WARNING;
-            image_id = Gtk.Stock.DIALOG_WARNING;
+            image_id = "dialog-warning";
             /* Warning displayed when no scanners are detected */
             title = _("No scanners detected");
             /* Hint to user on why there are no scanners detected */
@@ -210,7 +303,7 @@ public class UserInterface
         }
 
         info_bar.set_message_type (type);
-        info_bar_image.set_from_stock (image_id, Gtk.IconSize.DIALOG);
+        info_bar_image.set_from_icon_name (image_id, Gtk.IconSize.DIALOG);
         var message = "<big><b>%s</b></big>\n\n%s".printf (title, text);
         info_bar_label.set_markup (message);
         info_bar_close_button.set_visible (show_close_button);
@@ -292,37 +385,14 @@ public class UserInterface
         update_info_bar ();
     }
 
-    private string? get_selected_device ()
-    {
-        Gtk.TreeIter iter;
-
-        if (device_combo.get_active_iter (out iter))
-        {
-            string device;
-            device_model.get (iter, 0, out device, -1);
-            return device;
-        }
-
-        return null;
-    }
-
-    public void set_selected_device (string device)
-    {
-        Gtk.TreeIter iter;
-        if (!find_scan_device (device, out iter))
-            return;
-
-        device_combo.set_active_iter (iter);
-        user_selected_device = true;
-    }
-
     private void add_default_page ()
     {
-        var page = book.append_page (default_page_width,
-                                     default_page_height,
-                                     default_page_dpi,
-                                     default_page_scan_direction);
-        book_view.select_page (page);
+        var page = new Page (default_page_width,
+                             default_page_height,
+                             default_page_dpi,
+                             default_page_scan_direction);
+        book.append_page (page);
+        book_view.selected_page = page;
     }
 
     private void on_file_type_changed (Gtk.TreeSelection selection)
@@ -363,8 +433,8 @@ public class UserInterface
                                                  _("Save As..."),
                                                  window,
                                                  Gtk.FileChooserAction.SAVE,
-                                                 Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                                                 Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT,
+                                                 _("_Cancel"), Gtk.ResponseType.CANCEL,
+                                                 _("_Save"), Gtk.ResponseType.ACCEPT,
                                                  null);
         save_dialog.set_do_overwrite_confirmation (true);
         save_dialog.set_local_only (false);
@@ -493,7 +563,7 @@ public class UserInterface
         show_progress_dialog ();
         try
         {
-            book.save (format, get_quality (), file);
+            book.save (format, quality, file);
         }
         catch (Error e)
         {
@@ -507,13 +577,13 @@ public class UserInterface
         }
 
         book_uri = uri;
-        book.set_needs_saving (false);
+        book.needs_saving = false;
         return true;
     }
 
     private bool prompt_to_save (string title, string discard_label)
     {
-        if (!book.get_needs_saving ())
+        if (!book.needs_saving)
             return true;
 
         var dialog = new Gtk.MessageDialog (window,
@@ -525,8 +595,8 @@ public class UserInterface
                                       /* Text in dialog warning when a document is about to be lost*/
                                       _("If you don't save, changes will be permanently lost."));
         dialog.add_button (discard_label, Gtk.ResponseType.NO);
-        dialog.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
-        dialog.add_button (Gtk.Stock.SAVE, Gtk.ResponseType.YES);
+        dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
+        dialog.add_button (_("_Save"), Gtk.ResponseType.YES);
 
         var response = dialog.run ();
         dialog.destroy ();
@@ -551,13 +621,12 @@ public class UserInterface
         book.clear ();
         add_default_page ();
         book_uri = null;
-        book.set_needs_saving (false);
+        book.needs_saving = false;
         save_as_menuitem.set_sensitive (false);
         copy_to_clipboard_menuitem.set_sensitive (false);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT new_button_clicked_cb", instance_pos = -1)]
-    public void new_button_clicked_cb (Gtk.Widget widget)
+    private void new_document ()
     {
         if (!prompt_to_save (/* Text in dialog warning when a document is about to be lost */
                              _("Save current document?"),
@@ -570,7 +639,18 @@ public class UserInterface
         clear_document ();
     }
 
-    private void set_document_hint (string document_hint)
+    [CCode (cname = "G_MODULE_EXPORT new_button_clicked_cb", instance_pos = -1)]
+    public void new_button_clicked_cb (Gtk.Widget widget)
+    {
+        new_document();
+    }
+
+    public void new_document_activate_cb ()
+    {
+        new_document();
+    }
+
+    private void set_document_hint (string document_hint, bool save = false)
     {
         this.document_hint = document_hint;
 
@@ -584,20 +664,25 @@ public class UserInterface
             photo_toolbar_menuitem.set_active (true);
             photo_menu_menuitem.set_active (true);
         }
+
+        if (save)
+            settings.set_string ("document-type", document_hint);
     }
 
     [CCode (cname = "G_MODULE_EXPORT text_menuitem_toggled_cb", instance_pos = -1)]
     public void text_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
         if (widget.get_active ())
-            set_document_hint ("text");
+            set_document_hint ("text", true);
     }
 
     [CCode (cname = "G_MODULE_EXPORT photo_menuitem_toggled_cb", instance_pos = -1)]
     public void photo_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
         if (widget.get_active ())
-            set_document_hint ("photo");
+        {
+            set_document_hint ("photo", true);
+        }
     }
 
     private void set_page_side (ScanType page_side)
@@ -639,21 +724,6 @@ public class UserInterface
         if (have_iter)
             paper_size_combo.set_active_iter (iter);
     }
-    
-    private void set_brightness (int brightness)
-    {
-        brightness_adjustment.set_value (brightness);
-    }
-
-    private void set_contrast (int contrast)
-    {
-        contrast_adjustment.set_value (contrast);
-    }
-
-    private void set_quality (int quality)
-    {
-        quality_adjustment.set_value (quality);
-    }
 
     private int get_text_dpi ()
     {
@@ -702,22 +772,7 @@ public class UserInterface
         return false;
     }
 
-    private int get_brightness ()
-    {
-        return (int) brightness_adjustment.get_value ();
-    }
-
-    private int get_contrast ()
-    {
-        return (int) contrast_adjustment.get_value ();
-    }
-
-    private int get_quality ()
-    {
-        return (int) quality_adjustment.get_value ();
-    }
-
-    private ScanOptions get_scan_options ()
+    private ScanOptions make_scan_options ()
     {
         var options = new ScanOptions ();
         if (document_hint == "text")
@@ -733,8 +788,8 @@ public class UserInterface
             options.depth = 8;
         }
         get_paper_size (out options.paper_width, out options.paper_height);
-        options.brightness = get_brightness ();
-        options.contrast = get_contrast ();
+        options.brightness = brightness;
+        options.contrast = contrast;
 
         return options;
     }
@@ -742,9 +797,9 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT scan_button_clicked_cb", instance_pos = -1)]
     public void scan_button_clicked_cb (Gtk.Widget widget)
     {
-        var options = get_scan_options ();
+        var options = make_scan_options ();
         options.type = ScanType.SINGLE;
-        start_scan (get_selected_device (), options);
+        start_scan (selected_device, options);
     }
 
     [CCode (cname = "G_MODULE_EXPORT stop_scan_button_clicked_cb", instance_pos = -1)]
@@ -760,9 +815,9 @@ public class UserInterface
             stop_scan ();
         else
         {
-            var options = get_scan_options ();
+            var options = make_scan_options ();
             options.type = get_page_side ();
-            start_scan (get_selected_device (), options);
+            start_scan (selected_device, options);
         }
     }
 
@@ -772,6 +827,11 @@ public class UserInterface
         preferences_dialog.present ();
     }
 
+    public void preferences_activate_cb ()
+    {
+        preferences_dialog.present ();
+    }
+
     [CCode (cname = "G_MODULE_EXPORT preferences_dialog_delete_event_cb", instance_pos = -1)]
     public bool preferences_dialog_delete_event_cb (Gtk.Widget widget)
     {
@@ -786,7 +846,7 @@ public class UserInterface
 
     private void update_page_menu ()
     {
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         if (page == null)
         {
             page_move_left_menuitem.set_sensitive (false);
@@ -796,7 +856,7 @@ public class UserInterface
         {
             var index = book.get_page_index (page);
             page_move_left_menuitem.set_sensitive (index > 0);
-            page_move_right_menuitem.set_sensitive (index < book.get_n_pages () - 1);
+            page_move_right_menuitem.set_sensitive (index < book.n_pages - 1);
         }
     }
 
@@ -809,11 +869,11 @@ public class UserInterface
 
         update_page_menu ();
 
-        string? name = null;
-        if (page.has_crop ())
+        var name = "no_crop_menuitem";
+        if (page.has_crop)
         {
             // FIXME: Make more generic, move into page-size.c and reuse
-            var crop_name = page.get_named_crop ();
+            var crop_name = page.crop_name;
             if (crop_name != null)
             {
                 if (crop_name == "A4")
@@ -832,13 +892,11 @@ public class UserInterface
             else
                 name = "custom_crop_menuitem";
         }
-        else
-            name = "no_crop_menuitem";
 
         var menuitem = (Gtk.RadioMenuItem) builder.get_object (name);
         menuitem.set_active (true);
         var toolbutton = (Gtk.ToggleToolButton) builder.get_object ("crop_toolbutton");
-        toolbutton.set_active (page.has_crop ());
+        toolbutton.set_active (page.has_crop);
 
         updating_page_menu = false;
     }
@@ -852,7 +910,7 @@ public class UserInterface
 
         try
         {
-            page.save ("tiff", get_quality (), file);
+            page.save ("tiff", quality, file);
         }
         catch (Error e)
         {
@@ -885,7 +943,7 @@ public class UserInterface
     {
         if (updating_page_menu)
             return;
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         if (page != null)
             page.rotate_left ();
     }
@@ -895,7 +953,7 @@ public class UserInterface
     {
         if (updating_page_menu)
             return;
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         if (page != null)
             page.rotate_right ();
     }
@@ -907,19 +965,19 @@ public class UserInterface
         if (updating_page_menu)
             return;
 
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         if (page == null)
+        {
+            warning ("Trying to set crop but no selected page");
             return;
+        }
 
         if (crop_name == null)
-        {
             page.set_no_crop ();
-            return;
-        }
         else if (crop_name == "custom")
         {
-            var width = page.get_width ();
-            var height = page.get_height ();
+            var width = page.width;
+            var height = page.height;
             var crop_width = (int) (width * 0.8 + 0.5);
             var crop_height = (int) (height * 0.8 + 0.5);
             page.set_custom_crop (crop_width, crop_height);
@@ -1002,7 +1060,7 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT crop_rotate_menuitem_activate_cb", instance_pos = -1)]
     public void crop_rotate_menuitem_activate_cb (Gtk.Widget widget)
     {
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         if (page == null)
             return;
         page.rotate_crop ();
@@ -1011,7 +1069,7 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT page_move_left_menuitem_activate_cb", instance_pos = -1)]
     public void page_move_left_menuitem_activate_cb (Gtk.Widget widget)
     {
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         var index = book.get_page_index (page);
         if (index > 0)
             book.move_page (page, index - 1);
@@ -1022,9 +1080,9 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT page_move_right_menuitem_activate_cb", instance_pos = -1)]
     public void page_move_right_menuitem_activate_cb (Gtk.Widget widget)
     {
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         var index = book.get_page_index (page);
-        if (index < book.get_n_pages () - 1)
+        if (index < book.n_pages - 1)
             book.move_page (page, book.get_page_index (page) + 1);
 
         update_page_menu ();
@@ -1033,7 +1091,7 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT page_delete_menuitem_activate_cb", instance_pos = -1)]
     public void page_delete_menuitem_activate_cb (Gtk.Widget widget)
     {
-        book_view.get_book ().delete_page (book_view.get_selected ());
+        book_view.book.delete_page (book_view.selected_page);
     }
 
     [CCode (cname = "G_MODULE_EXPORT save_file_button_clicked_cb", instance_pos = -1)]
@@ -1042,10 +1100,15 @@ public class UserInterface
         save_document (false);
     }
 
+    public void save_document_activate_cb ()
+    {
+        save_document (false);
+    }
+
     [CCode (cname = "G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb", instance_pos = -1)]
     public void copy_to_clipboard_button_clicked_cb (Gtk.Widget widget)
     {
-        var page = book_view.get_selected ();
+        var page = book_view.selected_page;
         if (page != null)
             page.copy_to_clipboard (window);
     }
@@ -1056,6 +1119,11 @@ public class UserInterface
         save_document (true);
     }
 
+    public void save_as_document_activate_cb ()
+    {
+        save_document (true);
+    }
+
     private void draw_page (Gtk.PrintOperation operation,
                             Gtk.PrintContext   print_context,
                             int                page_number)
@@ -1067,14 +1135,14 @@ public class UserInterface
         bool is_landscape = false;
         if (print_context.get_width () > print_context.get_height ())
             is_landscape = true;
-        if (page.is_landscape () != is_landscape)
+        if (page.is_landscape != is_landscape)
         {
             context.translate (print_context.get_width (), 0);
             context.rotate (Math.PI_2);
         }
 
-        context.scale (print_context.get_dpi_x () / page.get_dpi (),
-                       print_context.get_dpi_y () / page.get_dpi ());
+        context.scale (print_context.get_dpi_x () / page.dpi,
+                       print_context.get_dpi_y () / page.dpi);
 
         var image = page.get_image (true);
         Gdk.cairo_set_source_pixbuf (context, image, 0, 0);
@@ -1084,14 +1152,18 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT email_button_clicked_cb", instance_pos = -1)]
     public void email_button_clicked_cb (Gtk.Widget widget)
     {
-        email (document_hint, get_quality ());
+        email (document_hint, quality);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT print_button_clicked_cb", instance_pos = -1)]
-    public void print_button_clicked_cb (Gtk.Widget widget)
+    public void email_document_activate_cb ()
+    {
+        email (document_hint, quality);
+    }
+    
+    private void print_document ()
     {
         var print = new Gtk.PrintOperation ();
-        print.set_n_pages ((int) book.get_n_pages ());
+        print.set_n_pages ((int) book.n_pages);
         print.draw_page.connect (draw_page);
 
         try
@@ -1106,8 +1178,18 @@ public class UserInterface
         print.draw_page.disconnect (draw_page);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT help_contents_menuitem_activate_cb", instance_pos = -1)]
-    public void help_contents_menuitem_activate_cb (Gtk.Widget widget)
+    [CCode (cname = "G_MODULE_EXPORT print_button_clicked_cb", instance_pos = -1)]
+    public void print_button_clicked_cb (Gtk.Widget widget)
+    {
+        print_document ();
+    }
+
+    public void print_document_activate_cb ()
+    {
+        print_document ();
+    }
+
+    private void show_help ()
     {
         try
         {
@@ -1121,8 +1203,18 @@ public class UserInterface
         }
     }
 
-    [CCode (cname = "G_MODULE_EXPORT about_menuitem_activate_cb", instance_pos = -1)]
-    public void about_menuitem_activate_cb (Gtk.Widget widget)
+    [CCode (cname = "G_MODULE_EXPORT help_contents_menuitem_activate_cb", instance_pos = -1)]
+    public void help_contents_menuitem_activate_cb (Gtk.Widget widget)
+    {
+        show_help ();
+    }
+
+    public void help_contents_activate_cb ()
+    {
+        show_help ();
+    }
+
+    private void show_about ()
     {
         string[] authors = { "Robert Ancell <robert.ancell@canonical.com>" };
 
@@ -1150,6 +1242,17 @@ public class UserInterface
                                null);
     }
 
+    [CCode (cname = "G_MODULE_EXPORT about_menuitem_activate_cb", instance_pos = -1)]
+    public void about_menuitem_activate_cb (Gtk.Widget widget)
+    {
+        show_about ();
+    }
+
+    public void about_activate_cb ()
+    {
+        show_about ();
+    }
+
     private bool on_quit ()
     {
         if (!prompt_to_save (/* Text in dialog warning when a document is about to be lost */
@@ -1158,33 +1261,12 @@ public class UserInterface
                              _("Quit without Saving")))
             return false;
 
-        var device = get_selected_device ();
-        int paper_width = 0, paper_height = 0;
-        get_paper_size (out paper_width, out paper_height);
-
-        if (device != null)
-            settings.set_string ("selected-device", device);
-        settings.set_string ("document-type", document_hint);
-        settings.set_int ("text-dpi", get_text_dpi ());
-        settings.set_int ("photo-dpi", get_photo_dpi ());
-        settings.set_enum ("page-side", get_page_side ());
-        settings.set_int ("paper-width", paper_width);
-        settings.set_int ("paper-height", paper_height);
-        settings.set_int ("brightness", get_brightness ());
-        settings.set_int ("contrast", get_contrast ());
-        settings.set_int ("jpeg-quality", get_quality ());
-        settings.set_int ("window-width", window_width);
-        settings.set_int ("window-height", window_height);
-        settings.set_boolean ("window-is-maximized", window_is_maximized);
-        settings.set_enum ("scan-direction", default_page_scan_direction);
-        settings.set_int ("page-width", default_page_width);
-        settings.set_int ("page-height", default_page_height);
-        settings.set_int ("page-dpi", default_page_dpi);
-
         window.destroy ();
 
-        if (autosave_manager != null)
-            autosave_manager.cleanup ();
+        if (save_state_timeout != 0)
+            save_state (true);
+
+        autosave_manager.cleanup ();
 
         return true;
     }
@@ -1195,6 +1277,11 @@ public class UserInterface
         on_quit ();
     }
 
+    public void quit_activate_cb ()
+    {
+        on_quit ();
+    }
+
     [CCode (cname = "G_MODULE_EXPORT simple_scan_window_configure_event_cb", instance_pos = -1)]
     public bool simple_scan_window_configure_event_cb (Gtk.Widget widget, Gdk.EventConfigure event)
     {
@@ -1202,6 +1289,7 @@ public class UserInterface
         {
             window_width = event.width;
             window_height = event.height;
+            save_state ();
         }
 
         return false;
@@ -1227,7 +1315,10 @@ public class UserInterface
     public bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
     {
         if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0)
+        {
             window_is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0;
+            save_state ();
+        }
         return false;
     }
 
@@ -1239,22 +1330,22 @@ public class UserInterface
 
     private void page_size_changed_cb (Page page)
     {
-        default_page_width = page.get_width ();
-        default_page_height = page.get_height ();
-        default_page_dpi = page.get_dpi ();
+        default_page_width = page.width;
+        default_page_height = page.height;
+        default_page_dpi = page.dpi;
+        save_state ();
     }
 
     private void page_scan_direction_changed_cb (Page page)
     {
-        default_page_scan_direction = page.get_scan_direction ();
+        default_page_scan_direction = page.scan_direction;
+        save_state ();
     }
 
     private void page_added_cb (Book book, Page page)
     {
-        default_page_width = page.get_width ();
-        default_page_height = page.get_height ();
-        default_page_dpi = page.get_dpi ();
-        default_page_scan_direction = page.get_scan_direction ();
+        page_size_changed_cb (page);
+        default_page_scan_direction = page.scan_direction;
         page.size_changed.connect (page_size_changed_cb);
         page.scan_direction_changed.connect (page_scan_direction_changed_cb);
 
@@ -1267,7 +1358,7 @@ public class UserInterface
         page.scan_direction_changed.disconnect (page_scan_direction_changed_cb);
 
         /* If this is the last page add a new blank one */
-        if (book.get_n_pages () == 1)
+        if (book.n_pages == 1)
             add_default_page ();
 
         update_page_menu ();
@@ -1308,23 +1399,43 @@ public class UserInterface
 
     private void needs_saving_cb (Book book)
     {
-        save_menuitem.set_sensitive (book.get_needs_saving ());
-        save_toolbutton.set_sensitive (book.get_needs_saving ());
-        if (book.get_needs_saving ())
+        save_menuitem.set_sensitive (book.needs_saving);
+        save_toolbutton.set_sensitive (book.needs_saving);
+        if (book.needs_saving)
             save_as_menuitem.set_sensitive (true);
         copy_to_clipboard_menuitem.set_sensitive (true);
     }
 
+    private bool has_app_menu (Gtk.Application app)
+    {
+        /* We have three cases:
+         * - GNOME 3: show-app-menu true, show-menubar false -> use the app menu
+         * - Unity, OSX: show-app-menu and show-menubar true -> use the normal menu
+         * - Other WM, Windows: show-app-menu and show-menubar false -> use the normal menu
+         */
+        var gtk_settings = Gtk.Settings.get_default ();
+
+        bool show_app_menu = false;
+        bool show_menubar = true;
+        gtk_settings.get ("gtk-shell-shows-app-menu", &show_app_menu, "gtk-shell-shows-menubar", &show_menubar, null);
+
+        return show_app_menu && !show_menubar;
+    }
+
     private void load ()
     {
         Gtk.IconTheme.get_default ().append_search_path (ICON_DIR);
 
         Gtk.Window.set_default_icon_name ("scanner");
 
+        var app = Application.get_default () as Gtk.Application;
+
         builder = new Gtk.Builder ();
         try
         {
             builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan.ui");
+            if (has_app_menu (app))
+                builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan-menu.ui");
         }
         catch (Error e)
         {
@@ -1337,10 +1448,17 @@ public class UserInterface
         }
         builder.connect_signals (this);
 
-        window = (Gtk.Window) builder.get_object ("simple_scan_window");
-        var app = Application.get_default () as Gtk.Application;
+        window = (Gtk.ApplicationWindow) builder.get_object ("simple_scan_window");
         app.add_window (window);
-        main_vbox = (Gtk.VBox) builder.get_object ("main_vbox");
+        menubar = (Gtk.MenuBar) builder.get_object ("menubar");
+        if (has_app_menu (app))
+        {
+            app_menu = (GLib.MenuModel) builder.get_object ("appmenu");
+            app.add_action_entries (action_entries, this);
+            app.set_app_menu (app_menu);
+            menubar.set_visible(false);
+        }
+        main_vbox = (Gtk.Box) builder.get_object ("main_vbox");
         page_move_left_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_left_menuitem");
         page_move_right_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_right_menuitem");
         page_delete_menuitem = (Gtk.MenuItem) builder.get_object ("page_delete_menuitem");
@@ -1389,7 +1507,7 @@ public class UserInterface
         content_area.add (hbox);
         hbox.show ();
 
-        info_bar_image = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_WARNING, Gtk.IconSize.DIALOG);
+        info_bar_image = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
         hbox.pack_start (info_bar_image, false, true, 0);
         info_bar_image.show ();
 
@@ -1398,7 +1516,7 @@ public class UserInterface
         hbox.pack_start (info_bar_label, true, true, 0);
         info_bar_label.show ();
 
-        info_bar_close_button = (Gtk.Button) info_bar.add_button (Gtk.Stock.CLOSE, Gtk.ResponseType.CLOSE);
+        info_bar_close_button = (Gtk.Button) info_bar.add_button (_("_Close"), Gtk.ResponseType.CLOSE);
         info_bar_change_scanner_button = (Gtk.Button) info_bar.add_button (/* Button in error infobar to open preferences dialog and change scanner */
                                                                            _("Change _Scanner"), 1);
 
@@ -1424,10 +1542,12 @@ public class UserInterface
         if (dpi <= 0)
             dpi = DEFAULT_TEXT_DPI;
         set_dpi_combo (text_dpi_combo, DEFAULT_TEXT_DPI, dpi);
+        text_dpi_combo.changed.connect (() => { settings.set_int ("text-dpi", get_text_dpi ()); });
         dpi = settings.get_int ("photo-dpi");
         if (dpi <= 0)
             dpi = DEFAULT_PHOTO_DPI;
         set_dpi_combo (photo_dpi_combo, DEFAULT_PHOTO_DPI, dpi);
+        photo_dpi_combo.changed.connect (() => { settings.set_int ("photo-dpi", get_photo_dpi ()); });
 
         var renderer = new Gtk.CellRendererText ();
         device_combo.pack_start (renderer, true);
@@ -1437,6 +1557,7 @@ public class UserInterface
         page_side_combo.pack_start (renderer, true);
         page_side_combo.add_attribute (renderer, "text", 1);
         set_page_side ((ScanType) settings.get_enum ("page-side"));
+        page_side_combo.changed.connect (() => { settings.set_enum ("page-side", get_page_side ()); });
 
         renderer = new Gtk.CellRendererText ();
         paper_size_combo.pack_start (renderer, true);
@@ -1444,6 +1565,13 @@ public class UserInterface
         var paper_width = settings.get_int ("paper-width");
         var paper_height = settings.get_int ("paper-height");
         set_paper_size (paper_width, paper_height);
+        paper_size_combo.changed.connect (() =>
+        {
+            int w, h;
+            get_paper_size (out w, out h);
+            settings.set_int ("paper-width", w);
+            settings.set_int ("paper-height", h);
+        });
 
         var lower = brightness_adjustment.get_lower ();
         var darker_label = "<small>%s</small>".printf (_("Darker"));
@@ -1452,7 +1580,8 @@ public class UserInterface
         brightness_scale.add_mark (lower, Gtk.PositionType.BOTTOM, darker_label);
         brightness_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
         brightness_scale.add_mark (upper, Gtk.PositionType.BOTTOM, lighter_label);
-        set_brightness (settings.get_int ("brightness"));
+        brightness = settings.get_int ("brightness");
+        brightness_adjustment.value_changed.connect (() => { settings.set_int ("brightness", brightness); });
 
         lower = contrast_adjustment.get_lower ();
         var less_label = "<small>%s</small>".printf (_("Less"));
@@ -1461,7 +1590,8 @@ public class UserInterface
         contrast_scale.add_mark (lower, Gtk.PositionType.BOTTOM, less_label);
         contrast_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
         contrast_scale.add_mark (upper, Gtk.PositionType.BOTTOM, more_label);
-        set_contrast (settings.get_int ("contrast"));
+        contrast = settings.get_int ("contrast");
+        contrast_adjustment.value_changed.connect (() => { settings.set_int ("contrast", contrast); });
 
         lower = quality_adjustment.get_lower ();
         var minimum_label = "<small>%s</small>".printf (_("Minimum"));
@@ -1470,7 +1600,8 @@ public class UserInterface
         quality_scale.add_mark (lower, Gtk.PositionType.BOTTOM, minimum_label);
         quality_scale.add_mark (75, Gtk.PositionType.BOTTOM, null);
         quality_scale.add_mark (upper, Gtk.PositionType.BOTTOM, maximum_label);
-        set_quality (settings.get_int ("jpeg-quality"));
+        quality = settings.get_int ("jpeg-quality");
+        quality_adjustment.value_changed.connect (() => { settings.set_int ("jpeg-quality", quality); });
 
         var device = settings.get_string ("selected-device");
         if (device != null)
@@ -1491,42 +1622,153 @@ public class UserInterface
         book_view.show_menu.connect (show_page_menu_cb);
         book_view.show ();
 
-        /* Find default page details */
-        default_page_scan_direction = (ScanDirection) settings.get_enum ("scan-direction");
-        default_page_width = settings.get_int ("page-width");
-        if (default_page_width <= 0)
-            default_page_width = 595;
-        default_page_height = settings.get_int ("page-height");
-        if (default_page_height <= 0)
-            default_page_height = 842;
-        default_page_dpi = settings.get_int ("page-dpi");
-        if (default_page_dpi <= 0)
-            default_page_dpi = 72;
+        /* Load previous state */
+        load_state ();
 
         /* Restore window size */
-        window_width = settings.get_int ("window-width");
-        if (window_width <= 0)
-            window_width = 600;
-        window_height = settings.get_int ("window-height");
-        if (window_height <= 0)
-            window_height = 400;
         debug ("Restoring window to %dx%d pixels", window_width, window_height);
         window.set_default_size (window_width, window_height);
-        window_is_maximized = settings.get_boolean ("window-is-maximized");
         if (window_is_maximized)
         {
             debug ("Restoring window to maximized");
             window.maximize ();
         }
 
-        if (book.get_n_pages () == 0)
-            add_default_page ();
-        book.set_needs_saving (false);
-        book.needs_saving_changed.connect (needs_saving_cb);
-
         progress_dialog = new ProgressBarDialog (window, _("Saving document..."));
         book.saving.connect (book_saving_cb);
     }
+    
+    private string state_filename
+    {
+        owned get { return Path.build_filename (Environment.get_user_cache_dir (), "simple-scan", "state"); }
+    }
+
+    private void load_state ()
+    {
+        debug ("Loading state from %s", state_filename);
+
+        var f = new KeyFile ();
+        try
+        {
+            f.load_from_file (state_filename, KeyFileFlags.NONE);
+        }
+        catch (Error e)
+        {
+            if (!(e is FileError.NOENT))
+                warning ("Failed to load state: %s", e.message);
+        }
+        window_width = state_get_integer (f, "window", "width", 600);
+        if (window_width <= 0)
+            window_width = 600;
+        window_height = state_get_integer (f, "window", "height", 400);
+        if (window_height <= 0)
+            window_height = 400;
+        window_is_maximized = state_get_boolean (f, "window", "is-maximized");
+        default_page_width = state_get_integer (f, "last-page", "width", 595);
+        default_page_height = state_get_integer (f, "last-page", "height", 842);
+        default_page_dpi = state_get_integer (f, "last-page", "dpi", 72);
+        switch (state_get_string (f, "last-page", "scan-direction", "top-to-bottom"))
+        {
+        default:
+        case "top-to-bottom":
+            default_page_scan_direction = ScanDirection.TOP_TO_BOTTOM;
+            break;
+        case "bottom-to-top":
+            default_page_scan_direction = ScanDirection.BOTTOM_TO_TOP;
+            break;
+        case "left-to-right":
+            default_page_scan_direction = ScanDirection.LEFT_TO_RIGHT;
+            break;
+        case "right-to-left":
+            default_page_scan_direction = ScanDirection.RIGHT_TO_LEFT;
+            break;
+        }
+    }
+
+    private int state_get_integer (KeyFile f, string group_name, string key, int default = 0)
+    {
+        try
+        {
+            return f.get_integer (group_name, key);
+        }
+        catch
+        {
+            return default;
+        }
+    }
+
+    private bool state_get_boolean (KeyFile f, string group_name, string key, bool default = false)
+    {
+        try
+        {
+            return f.get_boolean (group_name, key);
+        }
+        catch
+        {
+            return default;
+        }
+    }
+
+    private string state_get_string (KeyFile f, string group_name, string key, string default = "")
+    {
+        try
+        {
+            return f.get_string (group_name, key);
+        }
+        catch
+        {
+            return default;
+        }
+    }
+
+    private void save_state (bool force = false)
+    {
+        if (!force)
+        {
+            if (save_state_timeout != 0)
+                Source.remove (save_state_timeout);
+            save_state_timeout = Timeout.add (100, () =>
+            {
+                save_state (true);
+                save_state_timeout = 0;
+                return false;
+            });
+            return;
+        }
+
+        debug ("Saving state to %s", state_filename);
+
+        var f = new KeyFile ();
+        f.set_integer ("window", "width", window_width);
+        f.set_integer ("window", "height", window_height);
+        f.set_boolean ("window", "is-maximized", window_is_maximized);
+        f.set_integer ("last-page", "width", default_page_width);
+        f.set_integer ("last-page", "height", default_page_height);
+        f.set_integer ("last-page", "dpi", default_page_dpi);
+        switch (default_page_scan_direction)
+        {
+        case ScanDirection.TOP_TO_BOTTOM:
+            f.set_value ("last-page", "scan-direction", "top-to-bottom");
+            break;
+        case ScanDirection.BOTTOM_TO_TOP:
+            f.set_value ("last-page", "scan-direction", "bottom-to-top");
+            break;
+        case ScanDirection.LEFT_TO_RIGHT:
+            f.set_value ("last-page", "scan-direction", "left-to-right");
+            break;
+        case ScanDirection.RIGHT_TO_LEFT:
+            f.set_value ("last-page", "scan-direction", "right-to-left");
+            break;
+        }
+        try
+        {
+            FileUtils.set_contents (state_filename, f.to_data ());
+        }
+        catch (Error e)
+        {
+            warning ("Failed to write state: %s", e.message);
+        }
+    }
 
     private void book_saving_cb (int page_number)
     {
@@ -1534,7 +1776,7 @@ public class UserInterface
         while (Gtk.events_pending ())
           Gtk.main_iteration ();
 
-        var total = (int) book.get_n_pages ();
+        var total = (int) book.n_pages;
         var fraction = (page_number + 1.0) / total;
         var complete = fraction == 1.0;
         if (complete)
@@ -1558,29 +1800,6 @@ public class UserInterface
         progress_dialog.hide ();
     }
 
-    public Book get_book ()
-    {
-        return book;
-    }
-
-    public void set_selected_page (Page page)
-    {
-        book_view.select_page (page);
-    }
-
-    public Page get_selected_page ()
-    {
-        return book_view.get_selected ();
-    }
-
-    public void set_scanning (bool scanning)
-    {
-        this.scanning = scanning;
-        page_delete_menuitem.set_sensitive (!scanning);
-        stop_menuitem.set_sensitive (scanning);
-        stop_toolbutton.set_sensitive (scanning);
-    }
-
     public void show_error (string error_title, string error_text, bool change_scanner_hint)
     {
         have_error = true;
@@ -1600,7 +1819,7 @@ class ProgressBarDialog : Gtk.Window
 {
     Gtk.ProgressBar bar;
 
-    public ProgressBarDialog (Gtk.Window parent, string title)
+    public ProgressBarDialog (Gtk.ApplicationWindow parent, string title)
     {
         bar = new Gtk.ProgressBar ();
         var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);