Imported Upstream version 3.15.4upstream/3.15.4

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-01-19 09:43:17 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-01-19 09:43:17 +0100
commit: d8006d3987034f51ee84f034fb5c9cb33195600d (patch)
tree: 6617fbc43905eb346b305fbf4b83968c3ed22721
parent: d09fb0180e126967c94a13b6414694dfb9be313c (diff)
79 files changed, 8864 insertions, 8205 deletions
diff --git a/NEWS b/NEWS
index 7f9a0e9..8b759c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Overview of changes in simple-scan 3.15.4
+
+  * Fix error where document was discarded if warning dialog was closed
+  * Use window decorations if running in Unity of XFCE, all others get the headerbar
+  * Add GenericName to .desktop file
+  * Add some keywords in the .desktop file
+  * Initialize GTK+ after command line options are parsed
+
 Overview of changes in simple-scan 3.15.3
 
   * Updated translations
diff --git a/configure b/configure
index e678177..7a51cda 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.15.3.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.15.4.
 #
 #
 # 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.15.3'
-PACKAGE_STRING='simple-scan 3.15.3'
+PACKAGE_VERSION='3.15.4'
+PACKAGE_STRING='simple-scan 3.15.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1398,7 +1398,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.15.3 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.15.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,7 +1464,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.15.3:";;
+     short | recursive ) echo "Configuration of simple-scan 3.15.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1580,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.15.3
+simple-scan configure 3.15.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1945,7 +1945,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.15.3, which was
+It was created by simple-scan $as_me 3.15.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2808,7 +2808,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.15.3'
+ VERSION='3.15.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6522,7 +6522,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.15.3, which was
+This file was extended by simple-scan $as_me 3.15.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6579,7 +6579,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.15.3
+simple-scan config.status 3.15.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index aa17e9a..5b9a9f1 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.15.3)
+AC_INIT(simple-scan, 3.15.4)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/data/simple-scan.desktop.in b/data/simple-scan.desktop.in
index cc1864f..08c2072 100644
--- a/data/simple-scan.desktop.in
+++ b/data/simple-scan.desktop.in
@@ -1,6 +1,8 @@
 [Desktop Entry]
 _Name=Simple Scan
+_GenericName=Document Scanner
 _Comment=Scan Documents
+_Keywords=scan;scanner;flatbed;adf;
 Exec=simple-scan
 Icon=scanner
 Terminal=false
diff --git a/po/af.po b/po/af.po
index e943eb5..bf5bec8 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:37+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skandeer"
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Stoor"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Insny"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Voorkeure"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skandeer dokumente"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Skanderingstoestel"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "Geskandeerde dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -455,7 +463,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -476,7 +484,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Stoor as..."
 
@@ -529,52 +537,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -591,16 +599,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -613,106 +621,106 @@ msgstr ""
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 2b0e33c..8247835 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:37+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "صورة"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "امسح"
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "احفظ"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "اقتصاص"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "التفضيلات"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "امسح المستندات"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "الجهاز الذي سيمسح منه"
@@ -437,12 +445,12 @@ msgid "Scanned Document"
 msgstr "مستند ممسوح"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
@@ -451,7 +459,7 @@ msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارا
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -472,7 +480,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
@@ -525,52 +533,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +605,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -615,6 +623,7 @@ msgstr ""
 "  Ibrahim Saed https://launchpad.net/~ibraheem5000\n"
 "  Kaïs Bejaoui https://launchpad.net/~kais\n"
 "  Khaled Hosny https://launchpad.net/~khaledhosny\n"
+"  Khalid Abu Shawarib https://launchpad.net/~k-killer-7\n"
 "  Usama Akkad https://launchpad.net/~damascene\n"
 "  abdallah alemran https://launchpad.net/~abukhallad\n"
 "  benohb https://launchpad.net/~hamid\n"
@@ -622,106 +631,106 @@ msgstr ""
 "  rashed alhazimi https://launchpad.net/~linex"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
diff --git a/po/ast.po b/po/ast.po
index 0db5988..04a10f8 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Semeya"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferencies"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Calidá:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -437,12 +445,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -453,7 +461,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Zarrar"
 
@@ -474,7 +482,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Guardar como..."
 
@@ -527,52 +535,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -601,16 +609,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -620,106 +628,106 @@ msgstr ""
 "  ivarela https://launchpad.net/~ivarela"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
diff --git a/po/az.po b/po/az.po
index ded6504..b2516fd 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
-"PO-Revision-Date: 2012-04-17 06:12+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"PO-Revision-Date: 2015-01-01 15:02+0000\n"
+"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -30,7 +30,7 @@ msgstr ""
 #. Label beside password entry
 #: ../data/simple-scan.ui.h:6
 msgid "_Password:"
-msgstr ""
+msgstr "_Şifrə:"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:8
@@ -45,7 +45,7 @@ msgstr "Ön"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr "Geri"
+msgstr "Arxa"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
@@ -55,7 +55,7 @@ msgstr ""
 #. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:16
 msgid "_Document"
-msgstr ""
+msgstr "_Sәnәd"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:18
@@ -79,7 +79,7 @@ msgstr ""
 
 #: ../data/simple-scan.ui.h:25
 msgid "Text"
-msgstr ""
+msgstr "Mətn"
 
 #: ../data/simple-scan.ui.h:26
 msgid "Photo"
@@ -87,19 +87,19 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
 msgid "_Email"
-msgstr ""
+msgstr "_Epoçt"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:32
 msgid "_Page"
-msgstr ""
+msgstr "_Səhifə"
 
 #. Menu item to rotate page to left (anti-clockwise)
 #: ../data/simple-scan.ui.h:34
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Kəs"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,122 +593,123 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Emin Mastizada https://launchpad.net/~emin25"
+"  Emin Mastizada https://launchpad.net/~emin25\n"
+"  Nicat Məmmədov https://launchpad.net/~nicat455"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 7a925ab..35f3505 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Снимка"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Сканирай"
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Съхрани"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Изрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Качество:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканиране на документи"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство за сканиране"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "Сканиран документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Инструмент за сканиране"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -456,7 +464,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -477,7 +485,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Съхрани като..."
 
@@ -530,52 +538,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +614,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "За програмата"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -629,106 +637,106 @@ msgstr ""
 "  Филип Андонов https://launchpad.net/~vonodna"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Тъмно"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Светло"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Малко"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Много"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Минимално"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Максимално"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
diff --git a/po/bo.po b/po/bo.po
index bb9a82d..954dc3d 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "པར"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "པར་བཤུ"
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "གསོག་ཉར"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "གཅད"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ཡིག་གེ་པར་བཤུ"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
@@ -437,12 +445,12 @@ msgid "Scanned Document"
 msgstr "པར་བཤུ་ཚར་བའི་ཡི་གེ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -451,7 +459,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -472,7 +480,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
@@ -525,52 +533,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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,122 +607,122 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 83c2c6e..a863dd3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Escaneja"
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Desa"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Qualitat:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
@@ -444,12 +452,12 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -460,7 +468,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -481,7 +489,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
@@ -534,52 +542,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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,16 +619,16 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -635,106 +643,106 @@ msgstr ""
 "  pancake https://launchpad.net/~pancake"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 505a17d..05a5a89 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Escaneja"
 msgid "Save document to a file"
 msgstr "Guarda el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Guarda"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Qualitat:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanegeu documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
@@ -444,12 +452,12 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -460,7 +468,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -481,7 +489,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Anomena i guarda..."
 
@@ -534,52 +542,52 @@ msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho guardeu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Voleu guardar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut guardar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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,16 +619,16 @@ msgstr ""
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -628,106 +636,106 @@ msgstr ""
 "  Joan Duran https://launchpad.net/~jodufi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Voleu guardar el document abans d'eixir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Ix sense guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "S'està guardant el document..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està guardant la pàgina %d de %d"
diff --git a/po/ce.po b/po/ce.po
index 4ed811f..c62f8fa 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-08-12 08:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chechen <ce@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,120 +593,120 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index d35a039..38e5986 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotografie"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skenovat"
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Uložit"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Oříznout"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Předvolby"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kvalita:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Naskenovat dokumenty"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Zařízení určené ke skenování"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Skenovaný dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -458,7 +466,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "Z_avřít"
 
@@ -479,7 +487,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Uložit jako..."
 
@@ -532,52 +540,52 @@ 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:706
+#: ../src/ui.vala:705
 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:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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 +615,16 @@ msgstr ""
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -633,106 +641,106 @@ msgstr ""
 "  la_serpe https://launchpad.net/~tom-mil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Méně"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Více"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
diff --git a/po/da.po b/po/da.po
index c235245..327e47e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Billede"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Sortér sider påny"
 
@@ -205,7 +205,7 @@ msgstr "Skan"
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Gem"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Beskær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kvalitet:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skan dokumenter"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhed at skanne fra"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Skannet dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHED...] - Skanningsredskab"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -458,7 +466,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Luk"
 
@@ -479,7 +487,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Gem som..."
 
@@ -532,52 +540,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Kombinér sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Kombinér sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Bevar uændret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Kan ikke åbne hjælpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +614,16 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -632,106 +640,106 @@ msgstr ""
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nyt dokument"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Afslut"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mere"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
diff --git a/po/de.po b/po/de.po
index 13b44ce..014d46b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
-"PO-Revision-Date: 2012-07-23 08:58+0000\n"
-"Last-Translator: Daniel Schury <das.surst@gmail.com>\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"PO-Revision-Date: 2015-01-16 18:30+0000\n"
+"Last-Translator: Tobias Bannert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-17 06:39+0000\n"
+"X-Generator: Launchpad (build 17304)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Seiten umsortieren"
 
@@ -205,7 +205,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Speichern"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Zuschneiden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Qualität:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr "Dokument-Scanner"
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Dokumente scannen"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Scangerät"
@@ -443,12 +451,12 @@ msgid "Scanned Document"
 msgstr "Gescanntes Dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[GERÄT …] - Scan-Werkzeug"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -459,7 +467,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "S_chließen"
 
@@ -482,7 +490,7 @@ msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Speichern unter …"
 
@@ -536,52 +544,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Seiten zusammenfügen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Seiten zusammenfügen (umgekehrte Reihenfolge)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Vertauschen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Unverändert lassen"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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,16 +623,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -668,106 +676,106 @@ msgstr ""
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-Mail …"
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Drucken …"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Über"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Beenden"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Niedrig"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Hoch"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
diff --git a/po/el.po b/po/el.po
index e94e0e4..9d24135 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Φωτογραφία"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Σάρωση"
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Περικοπή"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Ποιότητα:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Σάρωση εγγράφων"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
@@ -448,12 +456,12 @@ msgid "Scanned Document"
 msgstr "Σαρωμένο"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -464,7 +472,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
@@ -487,7 +495,7 @@ msgstr ""
 "λειτουργία"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
@@ -540,52 +548,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +625,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -645,106 +653,106 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Περισσότερο"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
diff --git a/po/en_GB.po b/po/en_GB.po
index 6486d3b..6ecd935 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Photo"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
@@ -205,7 +205,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Save"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Crop"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Quality:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Device to scan from"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "Scanned Document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -456,7 +464,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Close"
 
@@ -477,7 +485,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Save As..."
 
@@ -530,52 +538,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Combine sides"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Reverse"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -604,16 +612,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -628,106 +636,106 @@ msgstr ""
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "New Document"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Print..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Help"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "About"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Quit"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
diff --git a/po/eo.po b/po/eo.po
index 8e47684..42c8f8a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2012-08-16 11:04+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@openmailbox.org>\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Skani"
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Konservi"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Stuci"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Agordoj"
 
@@ -293,9 +293,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skani dokumentojn"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "La aparato el kiu skani"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Skanita Dokumento"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APARATO...] - Skanutilaĵo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -457,7 +465,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -478,7 +486,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
@@ -531,52 +539,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +614,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -628,106 +636,106 @@ msgstr ""
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, 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:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
diff --git a/po/es.po b/po/es.po
index 06c716e..da6e106 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-07-22 10:50+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Reordenar las páginas"
 
@@ -205,7 +205,7 @@ msgstr "Escanear"
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Guardar"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Calidad:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Para escanear desde el dispositivo"
@@ -443,12 +451,12 @@ msgid "Scanned Document"
 msgstr "Documento escaneado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -459,7 +467,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Documento.pdf escaneado"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -480,7 +488,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Guardar como…"
 
@@ -533,52 +541,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (invertido)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Invertir"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Mantener sin cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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 +615,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -648,106 +656,106 @@ msgstr ""
 "  serrador https://launchpad.net/~fserrador"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Documento nuevo"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Correo..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Imprimir…"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Acerca de"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Salir"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Más claro"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
diff --git a/po/et.po b/po/et.po
index 7100771..31fba3a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skanni"
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Salvesta"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Kärbi"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Eelistused"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Dokumentide skannimine"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Seade, millest skannida"
@@ -438,12 +446,12 @@ msgid "Scanned Document"
 msgstr "Skannitud dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 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."
@@ -452,7 +460,7 @@ msgstr "Käivita '%s --help', et näha kõiki käsurea valikuid."
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -473,7 +481,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
@@ -526,52 +534,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -601,16 +609,16 @@ msgstr ""
 "<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -619,106 +627,106 @@ msgstr ""
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index f68adc1..7b4ecc1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Argazkia"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Berrordenatu orrialdeak"
 
@@ -205,7 +205,7 @@ msgstr "Eskaneatu"
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Gorde"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Moztu"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kalitatea:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Eskaneatu dokumentuak"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Eskaneatze-gailua"
@@ -444,12 +452,12 @@ msgid "Scanned Document"
 msgstr "Eskaneatutako dokumentua"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
@@ -458,7 +466,7 @@ msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
 msgid "Scanned Document.pdf"
 msgstr "Dokumentu.pdf eskaneatuta"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Itxi"
 
@@ -479,7 +487,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Gorde honela..."
 
@@ -532,52 +540,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Konbinatu aldeak"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Konbinatu aldeak (alderantziz)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Alderantziz"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Mantendu aldatu gabe"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +614,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -630,106 +638,106 @@ msgstr ""
 "  Xabier Isla Rodriguez https://launchpad.net/~xabier.isla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Dokumentu berria"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokumentua"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Bidali postaz..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Honi buruz"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Irten"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Ilunago"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Argiago"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Gutxiago"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
diff --git a/po/fi.po b/po/fi.po
index d6b2d69..25f97bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Valokuva"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
@@ -205,7 +205,7 @@ msgstr "Lue"
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Tallenna"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Rajaa"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Laatu:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Lue asiakirjoja kuvanlukijalta"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Laite jolta luetaan"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Kuvanlukuasiakirja"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[LAITE...] - Skannaus apuohjelma"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
@@ -456,7 +464,7 @@ msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Sulje"
 
@@ -477,7 +485,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
@@ -530,52 +538,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Käänteinen"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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,21 +614,21 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Elias Julkunen https://launchpad.net/~eliasj\n"
-"  Heidi Mattila https://launchpad.net/~hessuk\n"
+"  Heidi Mattila https://launchpad.net/~hessuk-deactivatedaccount\n"
 "  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
 "  Juhani Numminen https://launchpad.net/~jsonic\n"
 "  Ncl8 https://launchpad.net/~crofle\n"
@@ -630,106 +638,106 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Uusi asiakirja"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Asiakirja"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Sähköposti..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Ohje"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Tietoja"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Lopeta"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Tummempi"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Vähemmän"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Enemmän"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Parempi"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
diff --git a/po/fr.po b/po/fr.po
index 67cea6d..8d2bc85 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Photo"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
@@ -205,7 +205,7 @@ msgstr "Numériser"
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Recadrer"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -293,9 +293,17 @@ msgid "Quality:"
 msgstr "Qualité :"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Numériser depuis"
@@ -450,12 +458,12 @@ msgid "Scanned Document"
 msgstr "Document numérisé"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -466,7 +474,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numérisé"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -487,7 +495,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Enregistrer sous…"
 
@@ -541,52 +549,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Impossible d'ouvrir l'aperçu de l'image"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Associer les côtés"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Associer les côtés (inverser)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Inverser"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Maintenir inchangé"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +624,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -667,106 +675,106 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Courrier électronique..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Imprimer…"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "À propos"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Quitter"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Changer de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Enregistrement du document…"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/gd.po b/po/gd.po
index 6cb2f45..095d29c 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Dealbh"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Atharraich òrdugh nan duilleagan"
 
@@ -205,7 +205,7 @@ msgstr "Sganaich"
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Sàbhail"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Bearr"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Roghainnean"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Càileachd:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Sganaich sgrìobhainnean"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "An t-uidheam a nì an sganadh"
@@ -453,12 +461,12 @@ msgid "Scanned Document"
 msgstr "Sgrìobhainn sganaichte"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Goireas sganaidh"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -469,7 +477,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Sgrìobhainn sganaichte.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Dùin"
 
@@ -492,7 +500,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
@@ -546,52 +554,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 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:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Tilg air falbh na h-atharraichean"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Cuir còmhla na duilleagan"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Cuir còmhla na duilleagan (ann an òrdugh contrarra)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Contrarra"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Cum gun atharrachadh"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +628,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Mu dhèidhinn gleus simplidh nan sgana"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -637,106 +645,106 @@ msgstr ""
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Sgrìobhainn ùr"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Sgrìobhainn"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Post-d..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Clò-bhuail..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Cobhair"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Mu dhèidhinn"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Fàg an-seo"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Barrrachd"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
diff --git a/po/gl.po b/po/gl.po
index 257fdf1..0548118 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotografía"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Reordenar as páxinas"
 
@@ -205,7 +205,7 @@ msgstr "Escanear"
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Gardar"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Calidade:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Escanear documentos"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo desde o que escanear"
@@ -443,12 +451,12 @@ msgid "Scanned Document"
 msgstr "Documento escaneado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -459,7 +467,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf escaneado"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Pechar"
 
@@ -480,7 +488,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Gardar como..."
 
@@ -533,52 +541,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Combinar lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Manter sen cambios"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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 +615,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -627,106 +635,106 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Correo electrónico..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Axuda"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Saír"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Máis"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
diff --git a/po/he.po b/po/he.po
index 44fbed8..4d199f0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "צילום"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "סידור הדפים מחדש"
 
@@ -205,7 +205,7 @@ msgstr "סריקה"
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "שמירה"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "חיתוך"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "איכות:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "סריקת מסמכים"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Device to scan from"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "מסמך שנסרק"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -457,7 +465,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "ס_גירה"
 
@@ -478,7 +486,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
@@ -531,52 +539,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "שילוב צדדים"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "שילוב צדדים (הפוך)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "היפוך"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "להשאיר ללא שינוי"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +611,16 @@ msgstr ""
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -625,106 +633,106 @@ msgstr ""
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "מסמך חדש"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "מסמך"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "דוא״ל…"
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "הדפסה…"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "עזרה"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "על אודות"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "יציאה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "פחות"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "יותר"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "מזערי"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "מרבי"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
diff --git a/po/hr.po b/po/hr.po
index 07f9901..656f3bd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotografija"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skeniraj"
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Spremi"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Izreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Osobitosti"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skenirajte dokumente"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Uređaj za skeniranje"
@@ -445,12 +453,12 @@ msgid "Scanned Document"
 msgstr "Skenirani dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[UREĐAJ...] - Alat za skeniranje"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -461,7 +469,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -482,7 +490,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Spremi kao..."
 
@@ -535,52 +543,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Pohraniti trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Nije moguće otvoriti program za pregled slike"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Nije moguće otvoriti datoteku pomoći"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -609,16 +617,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "O jednostavnom skeniranju"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -631,106 +639,106 @@ msgstr ""
 "  student4 https://launchpad.net/~iputnik-msn"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Pohraniti dokument prije prekida rada?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Prekini bez spremanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (nacrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Promjeni _Skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index b6e86ec..9e2235d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-02-18 14:14+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fénykép"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Oldalak újrarendezése"
 
@@ -205,7 +205,7 @@ msgstr "Szkennelés"
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Mentés"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Vágás"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Minőség:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Dokumentumok szkennelése"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "A szkennelő eszkőz"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "Beszkennelt dokumentum"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -456,7 +464,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -478,7 +486,7 @@ msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Mentés másként…"
 
@@ -531,52 +539,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Oldalak egyesítése"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Oldalak egyesítése (fordított)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Fordított"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Maradjon változatlan"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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"
@@ -604,16 +612,16 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -630,106 +638,106 @@ msgstr ""
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 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:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Új dokumentum"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokumentum"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-mail…"
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Nyomtatás…"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Súgó"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Névjegy"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Kilépés"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
diff --git a/po/hy.po b/po/hy.po
index f025fbd..55a1d68 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,122 +593,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 1290214..d0c336c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Atur Ulang Halaman"
 
@@ -205,7 +205,7 @@ msgstr "Pindai"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kualitas:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Pindai Dokumen"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Perangkat untuk memindai"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "Dokumen Terpindai"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PERANGKAT...] - Utilitas pemindaian"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
@@ -455,7 +463,7 @@ msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -477,7 +485,7 @@ msgstr ""
 "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
@@ -530,52 +538,52 @@ msgid "If you don't save, changes will be permanently lost."
 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Kombinasikan sisi-sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Kombinasikan sisi-sisi (balik)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Balikkan"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Biarkan tak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +611,16 @@ msgstr ""
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -633,106 +641,106 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Dokumen Baru"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Surel..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Ganti _Pemindai"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Lebih"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
diff --git a/po/it.po b/po/it.po
index a94c03f..e6d2849 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Riordina pagine"
 
@@ -205,7 +205,7 @@ msgstr "Acquisisci"
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Salva"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Ritaglia"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Qualità:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Acquisisci documenti"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo di acquisizione"
@@ -445,12 +453,12 @@ msgid "Scanned Document"
 msgstr "Documento acquisito"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -461,7 +469,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Chiudi"
 
@@ -482,7 +490,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Salva come..."
 
@@ -535,53 +543,53 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Unisci lati"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Unisci lati (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Inverso"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Mantieni non modificato"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +620,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -648,106 +656,106 @@ msgstr ""
 "  phede92 https://launchpad.net/~phede92"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nuovo documento"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Email..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Stampa..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Informazioni"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Esci"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Più scura"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Minore"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Maggiore"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minima"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Massima"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
diff --git a/po/ja.po b/po/ja.po
index 9f873a1..c258003 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-11-20 05:14+0000\n"
 "Last-Translator: Kentaro Kazuhama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "写真"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "ページを再整列"
 
@@ -205,7 +205,7 @@ msgstr "スキャン"
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "保存"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "切り抜き"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "設定"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "品質:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ドキュメントをスキャンします"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "スキャンするデバイス"
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr "スキャン済みドキュメント"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
@@ -449,7 +457,7 @@ msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラ
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "現在のドキュメントを保存しますか?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "変更を破棄"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "画像プレビューアプリケーションを開けませんでした"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "面を結合"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "面を結合(逆順)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
-msgstr ""
+msgstr "逆順"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "無変更を維持"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "ヘルプファイルを開くことができません"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +605,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -622,106 +630,106 @@ msgstr ""
 "  Tosiki Iga https://launchpad.net/~tosiki-iga"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "終了する前にドキュメントを保存しますか?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "保存せずに終了"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (標準)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ドラフト)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "新しいドキュメント"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "ドキュメント"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "メール..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "印刷..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "このプログラムについて"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "終了"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "弱く"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "強く"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
diff --git a/po/kk.po b/po/kk.po
index 61f9e77..0f76f3e 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Фото"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Іздеу"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Сақтау"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Қиып жіберу"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Баптаулары"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,16 +593,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -602,106 +610,106 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index bddb6b6..2a4ce95 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "រូបថត"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "ការរៀបចំទំព័រ"
 
@@ -205,7 +205,7 @@ msgstr "ស្កេន"
 msgid "Save document to a file"
 msgstr "រក្សាទុកឯកសារទៅឯកសារ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "រក្សាទុក"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "ច្រឹប"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "គុណភាព ៖"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ស្កេនឯកសារ"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ឧបករណ៍ដែលត្រូវស្កេន"
@@ -445,12 +453,12 @@ msgid "Scanned Document"
 msgstr "ឯកសារដែលបានស្កេន"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការស្កេនឧបករណ៍ប្រើប្រាស់"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -460,7 +468,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែលបានស្កេន"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "បិទ"
 
@@ -483,7 +491,7 @@ msgstr ""
 "និងបើកកុងតាក់ហើយឬនៅ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "រក្សាទុកជា..."
 
@@ -538,52 +546,52 @@ msgstr ""
 "ការផ្លាស់ប្ដូរទាំងឡាយនិងត្រូវបានបាត់បង់ជាអចិន្ត្រៃយ៍ ។"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "រក្សាទុកឯកសារបច្ចុប្បន្ន ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "បោះបង់ការផ្លាស់ប្ដូរ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "មិនអាចរក្សាទុករូបភាពសម្រាប់ការមើលជាមុនបានទេ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "មិនអាចបើកកម្មវិធីមើលរូបភាពជាមុនបានទេ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "ផ្សំភាគី"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "បញ្ច្រាស"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "រក្សាឱ្យមិនមានការផ្លាស់ប្តូរ"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "មិនអាចបើកឯកសារជំនួយបានទេ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +621,16 @@ msgstr ""
 "សូមមើល<http://www.gnu.org/licenses/> ។"
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "អំពីការស្កេនធម្មតា"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍ស្កេនធម្មតា"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -632,106 +640,106 @@ msgstr ""
 "  Seng Sutha https://launchpad.net/~sutha"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "រក្សាទុកឯកសារមុនពេលបិទឬ ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "បិទដោយមិនរក្សាទុក"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "ឯកសារថ្មី"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "ឯកសារ"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "អ៊ីមេល..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "បោះពុម្ព..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "ជំនួយ"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "អំពី"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "ចេញ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "ប្ដូរម៉ាស៊ីនស្កេន"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "កំពុងរក្សាទុកឯកសារ..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុកទំព័រ %d ផុតសម័យ %d"
diff --git a/po/ky.po b/po/ky.po
index fd6ff9f..e71f1c2 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,122 +593,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 9ea04ea..bea034f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kokybė:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -439,12 +447,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ĮTAISAS...] - skaitymo paslaugų programa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -454,7 +462,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Užverti"
 
@@ -475,7 +483,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -528,52 +536,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Išsaugoti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -590,16 +598,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -612,106 +620,106 @@ msgstr ""
 "  romasg https://launchpad.net/~romasg"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Išeiti neišsaugant"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mažiausia"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Didžiausia"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Saugomas dokumentas..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saugomas puslapis %d iš %d"
diff --git a/po/lv.po b/po/lv.po
index 43c4a19..cf45488 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skenēt"
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Apcirst"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Iestatījumi"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kvalitāte:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skenēt dokumentus"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Ierīce, no kuras skenēt"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Skenēts dokuments"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -458,7 +466,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Aizvērt"
 
@@ -479,7 +487,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
@@ -532,52 +540,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Pagriezt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Paturēt nemainīti"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +611,16 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -622,106 +630,106 @@ msgstr ""
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Jauns dokuments"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokuments"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Epasts..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Palīdzība"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Par"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Iziet"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mazāk"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Vairāk"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimums"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksimums"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
diff --git a/po/mhr.po b/po/mhr.po
index 5aba74f..0bc7f4f 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Фотосӱрет"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Аныклаш"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Лектыш"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Ыштыш-кучыш:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr "Сканироватлыме документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,16 +593,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -602,106 +610,106 @@ msgstr ""
 "  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index b9820aa..2c584c4 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Tertib Semula Halaman"
 
@@ -205,7 +205,7 @@ msgstr "Imbas"
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Simpan"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Kerat"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Keutamaan"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kualiti:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Imbas Dokumen"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Peranti untuk diimbas dari"
@@ -443,12 +451,12 @@ msgid "Scanned Document"
 msgstr "Dokumen Terimbas"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utiliti mengimbas"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -459,7 +467,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -480,7 +488,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
@@ -533,52 +541,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Gabung sisi"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Gabung sisi (songsang)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Songsang"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Kekal tidak berubah"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +615,16 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -627,106 +635,106 @@ 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Dokumen Baharu"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokumen"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Emel..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Cetak..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Perihal"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Keluar"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
diff --git a/po/my.po b/po/my.po
index 6826a77..769ff3e 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "ဓာတ်ပုံ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Scan ဖတ်ပြီးသော စာရွက်စာတမ်း"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
@@ -456,7 +464,7 @@ msgstr "အမိန့်ပေး စာရင်း အပြည့်အစ�
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -479,7 +487,7 @@ msgstr ""
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Save As..."
 
@@ -532,52 +540,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +614,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -623,106 +631,106 @@ msgstr ""
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 913cff1..54c8c63 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-09-02 16:41+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Bilde"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Omplasser sider"
 
@@ -205,7 +205,7 @@ msgstr "Skann"
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Lagre"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Beskjær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kvalitet:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skann dokumenter"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhet det skal skannes fra"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Skannet dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Scanneutstyr"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -457,7 +465,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Lukk"
 
@@ -478,7 +486,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Lagre som..."
 
@@ -531,52 +539,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Kunne ikke lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Kombiner sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Kombiner sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Behold uendret"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -605,16 +613,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -626,106 +634,106 @@ msgstr ""
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-post …"
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Skriv ut …"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Avslutt"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
diff --git a/po/nl.po b/po/nl.po
index ddea0c1..c9e44d7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Bladzijden herschikken"
 
@@ -205,7 +205,7 @@ msgstr "Scannen"
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Opslaan"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Bijsnijden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Voorkeuren"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kwaliteit:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Documenten scannen"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Te gebruiken scanapparaat"
@@ -451,12 +459,12 @@ msgid "Scanned Document"
 msgstr "Gescand document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -467,7 +475,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Sluiten"
 
@@ -488,7 +496,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Opslaan als..."
 
@@ -541,52 +549,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Zijden samenvoegen"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Zijden samenvoegen (omgekeerd)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Omgekeerd"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Onveranderd laten"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +625,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -650,106 +658,106 @@ msgstr ""
 "  rob https://launchpad.net/~rvdb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nieuw document"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Hulp"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Over"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Afsluiten"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Donkerder"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lichter"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Minder"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Meer"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
diff --git a/po/oc.po b/po/oc.po
index 90ce5b7..d55cf33 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fòto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Numerizar"
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Enregistrar"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Requadrar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferéncias"
 
@@ -293,9 +293,17 @@ msgid "Quality:"
 msgstr "Qualitat :"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Numerizar de documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Numerizar dempuèi"
@@ -449,12 +457,12 @@ msgid "Scanned Document"
 msgstr "Document numerizat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Aisina de numerizacion"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -465,7 +473,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Tampar"
 
@@ -486,7 +494,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
@@ -539,52 +547,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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,16 +622,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -631,106 +639,106 @@ msgstr ""
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
diff --git a/po/pa.po b/po/pa.po
index 68a30d0..87c97b9 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "ਫੋਟੋ"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "ਸਕੈਨ"
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
@@ -437,12 +445,12 @@ msgid "Scanned Document"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -451,7 +459,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -472,7 +480,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
@@ -525,52 +533,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -587,122 +595,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index b0c0093..d79cdd7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-07-06 15:24+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Zdjęcie"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Zmień kolejność stron"
 
@@ -205,7 +205,7 @@ msgstr "Skanuj"
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Zapisz"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Przytnij"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Jakość:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skanowanie dokumentów"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Urządzenie skanujące"
@@ -445,12 +453,12 @@ msgid "Scanned Document"
 msgstr "Zeskanowany dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[URZĄDZENIE] - Narzędzie do skanowania"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -461,7 +469,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "Za_mknij"
 
@@ -482,7 +490,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
@@ -535,52 +543,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Połącz strony"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Połącz strony (odwrotnie)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Odwrotnie"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Bez zmiany"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +620,16 @@ msgstr ""
 "- proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,106 +651,106 @@ msgstr ""
 "  Wiatrak https://launchpad.net/~wiatrak."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d DPI (domyślnie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d DPI (szkic)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d DPI"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nowy dokument"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "O programie"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Zakończ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Zapisywanie dokumentu..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
diff --git a/po/pt.po b/po/pt.po
index abb6182..e2eb230 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-07-24 15:38+0000\n"
 "Last-Translator: Paulo Henriques <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Reordenar Páginas"
 
@@ -205,7 +205,7 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Guardar"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Qualidade:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Digitalizar Documentos"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
@@ -444,12 +452,12 @@ msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -460,7 +468,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Documento Digitalizado.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "Fechar"
 
@@ -481,7 +489,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Guardar Como..."
 
@@ -534,52 +542,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Guardar documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Descartar Alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Combinar lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Combinar Lados (inverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Inverter"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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"
@@ -609,16 +617,16 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalização Simples (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -653,106 +661,106 @@ msgstr ""
 "  styluss https://launchpad.net/~styluss"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Sair SEM Guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Novo Documento"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Documento"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a7156f0..70dda79 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,9 +87,9 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordenar páginas"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -205,7 +205,7 @@ msgstr "Digitalizar"
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Salvar"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Qualidade:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Digitalizar documentos"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
@@ -446,12 +454,12 @@ msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -462,7 +470,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "Fe_char"
 
@@ -483,7 +491,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Salvar como..."
 
@@ -536,52 +544,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
-msgstr ""
+msgstr "Combine os lados"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combine os lados (reverso)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
-msgstr ""
+msgstr "Reverso"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Manter inalterado"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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,16 +619,16 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador simples"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -648,106 +656,106 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
-msgstr ""
+msgstr "Novo documento"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
-msgstr ""
+msgstr "Documentos"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
-msgstr ""
+msgstr "E-mail..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
-msgstr ""
+msgstr "Imprimir..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
-msgstr ""
+msgstr "Sobre"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
-msgstr ""
+msgstr "Sair"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
diff --git a/po/ro.po b/po/ro.po
index da7e68a..5664b42 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
@@ -88,7 +88,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +206,7 @@ msgstr "Scanează"
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Salvează"
 
@@ -248,7 +248,7 @@ msgid "Crop"
 msgstr "Decupează"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferințe"
 
@@ -293,9 +293,17 @@ msgid "Quality:"
 msgstr "Calitate:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scanează documente"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispozitiv de folosit pentru scanare"
@@ -445,12 +453,12 @@ msgid "Scanned Document"
 msgstr "Document scanat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -461,7 +469,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "Înc_hide"
 
@@ -482,7 +490,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Salvează ca..."
 
@@ -535,52 +543,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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 +620,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -635,106 +643,106 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Mai luminos"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mai puțin"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mai mult"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minim"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maxim"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Se salvează pagina %d din %d"
diff --git a/po/ru.po b/po/ru.po
index 288dc64..a2d0909 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-07-10 05:43+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Фотография"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
@@ -205,7 +205,7 @@ msgstr "Отсканировать"
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Сохранить"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Обрезать"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Параметры"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Качество:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканирование документов"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство сканирования"
@@ -438,12 +446,12 @@ msgid "Scanned Document"
 msgstr "Отсканированный документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] — Устройство сканирования"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
@@ -452,7 +460,7 @@ msgstr "Выполните '%s --help', чтобы вывести полный �
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Закрыть"
 
@@ -473,7 +481,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Пожалуйста, проверьте, что сканер подсоединён и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Сохранить как..."
 
@@ -526,52 +534,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "В обратном порядке"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -600,16 +608,16 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "О программе"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -632,6 +640,7 @@ msgstr ""
 "  Int https://launchpad.net/~howrudoin\n"
 "  Ivan Bulychev https://launchpad.net/~vanyok\n"
 "  KEIII https://launchpad.net/~cashagent\n"
+"  ManDrive https://launchpad.net/~roman-romul\n"
 "  Net4Hack https://launchpad.net/~networkforhackers\n"
 "  Novichkov Alexander https://launchpad.net/~berkut\n"
 "  Oleg https://launchpad.net/~oleg-devyatilov\n"
@@ -649,106 +658,106 @@ msgstr ""
 "  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Новый документ"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Отправить..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Печать..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Справка"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "О программе"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Завершить"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
diff --git a/po/sd.po b/po/sd.po
index 101b4af..14acc9b 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "فوٽو"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "اسڪين"
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "سانڍيو"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "ڪاٽيو"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "ترجيحون"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "دستاويزات اسڪين ڪريو"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "اسڪين ڪرڻ لاءِ اوزار"
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr "اسڪين ٿيل دستاويز"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,122 +593,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/se.po b/po/se.po
index 1c6bb2d..38d0a5e 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotografiija"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Oza"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Vurke"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Oidimat"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,122 +593,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 3b22c2f..19cf023 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,120 +593,120 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 1f6d634..d2ffcb6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotografia"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skenovať"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Uložiť"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Orezanie"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Predvoľby"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kvalita:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skenovať dokumenty"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Zariadenie z ktorého skenovať"
@@ -439,12 +447,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -455,7 +463,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -476,7 +484,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
@@ -529,52 +537,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -604,16 +612,16 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -625,106 +633,106 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. strana z %d"
diff --git a/po/sl.po b/po/sl.po
index 820a153..0578fde 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotografija"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Optično branje"
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Shrani"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Obreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kakovost:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Optično preberite dokumente"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Naprava za optično branje"
@@ -442,12 +450,12 @@ msgid "Scanned Document"
 msgstr "Optično bran dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 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'."
@@ -456,7 +464,7 @@ msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'."
 msgid "Scanned Document.pdf"
 msgstr "Optično bran dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Zapri"
 
@@ -477,7 +485,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
@@ -530,52 +538,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +615,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -628,106 +636,106 @@ msgstr ""
 "  grofaty https://launchpad.net/~grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 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:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, 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:1636
+#: ../src/ui.vala:1635
 #, 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:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nov dokument"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-pošta ..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Natisni ..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "O programu"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Izhod"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Temenjše"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Manj"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Več"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Največ"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
diff --git a/po/sq.po b/po/sq.po
index 3963f59..ba67c09 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:07+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:37+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skanim"
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Ruaj"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Prej"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Cilësia:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Skanoj Dokumentet"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Paisje për te skanuar prej"
@@ -443,12 +451,12 @@ msgid "Scanned Document"
 msgstr "Dokumenti i Skanuar"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Mjet i skanimit"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -459,7 +467,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Mbylle"
 
@@ -481,7 +489,7 @@ msgstr ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
@@ -534,52 +542,52 @@ 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:706
+#: ../src/ui.vala:705
 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:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 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:1470
+#: ../src/ui.vala:1469
 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"
@@ -608,16 +616,16 @@ msgstr ""
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -626,106 +634,106 @@ msgstr ""
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
diff --git a/po/sr.po b/po/sr.po
index 305a4b8..efe6f2f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -87,7 +87,7 @@ msgstr "Слика"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Промени ред страница"
 
@@ -205,7 +205,7 @@ msgstr "Скенирај"
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Сачувај"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Одрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Поставке"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Квалитет:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Скенирајте документе"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Уређај са ког ће се скенирати"
@@ -448,12 +456,12 @@ msgid "Scanned Document"
 msgstr "Скенирани документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -463,7 +471,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -484,7 +492,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Сачувај као..."
 
@@ -537,52 +545,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Да сачувам текући документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Не могу да сачувам слику за преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Не могу да отворим програм за приказивање слика"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Обједини стране"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Обједини стране (преокрени)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Преокрени"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Задржи неизмењено"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +620,16 @@ msgstr ""
 "http://www.gnu.org/licenses/."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "О Једноставном скенирању"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -633,106 +641,106 @@ msgstr ""
 "  Мирослав Николић https://launchpad.net/~lipek"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d тпи"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Нови документ"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Ел. пошта..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Штампај..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "О програму"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Изађи"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Тамније"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Светлије"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Мање"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Више"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Најмање"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Највише"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
diff --git a/po/sv.po b/po/sv.po
index 15715b1..c3c8c89 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Foto"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Ändra sidordning"
 
@@ -205,7 +205,7 @@ msgstr "Läs in"
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Spara"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Beskär"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kvalitet:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Läs in dokument"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhet att läsa in från"
@@ -443,12 +451,12 @@ msgid "Scanned Document"
 msgstr "Inläst dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Bildinläsningsverktyg"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -459,7 +467,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Stäng"
 
@@ -480,7 +488,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Spara som..."
 
@@ -533,52 +541,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Kombinera sidor"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Kombinera sidor (omvänt)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Omvänt"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Behåll oförändrad"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -608,16 +616,16 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -633,106 +641,106 @@ msgstr ""
 "deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Nytt dokument"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Dokument"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-post..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Om"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Avsluta"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Mörkare"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
diff --git a/po/ta.po b/po/ta.po
index f72beb4..1cd22dd 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-03-22 13:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr ""
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,16 +593,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -604,106 +612,106 @@ msgstr ""
 "  mano-மனோ https://launchpad.net/~manoj-neyveli"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 7e72669..5b4139b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "ఫొటో"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "స్కాన్"
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "అంచులుసవరించు"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "పత్రాలు స్కాన్ చేయు"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "స్కాన్ చేయుటకు పరికరం"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "స్కాన్‌చేయబడిన పత్రం"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
@@ -455,7 +463,7 @@ msgstr "అందుబాటులో వున్న అదేశ వరుస
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -477,7 +485,7 @@ msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
@@ -530,52 +538,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +611,16 @@ msgstr ""
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -622,106 +630,106 @@ msgstr ""
 "  వీవెన్ https://launchpad.net/~veeven"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 5e17b08..2583797 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "ภาพถ่าย"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "สแกน"
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "บันทึก"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "ตัด"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "สแกนเอกสาร"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "เครื่องสแกนจาก"
@@ -440,12 +448,12 @@ msgid "Scanned Document"
 msgstr "เอกสารที่สแกนแล้ว"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
@@ -454,7 +462,7 @@ msgstr "เรียก '%s --help' เพื่อดูตัวเลือ�
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -475,7 +483,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
@@ -528,52 +536,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +610,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -623,106 +631,106 @@ msgstr ""
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 321fa60..138f128 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Fotoğraf"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Tara"
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Kaydet"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Kırp"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Kalite:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Belgeleri Tara"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Tarama yapılacak aygıt"
@@ -446,12 +454,12 @@ msgid "Scanned Document"
 msgstr "Taranmış Belge"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[AYGIT...] - Tarama uygulaması"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -462,7 +470,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Kapat"
 
@@ -483,7 +491,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
@@ -536,52 +544,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -610,16 +618,16 @@ msgstr ""
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,106 +651,106 @@ msgstr ""
 "  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
-msgstr ""
+msgstr "Yeni Belge"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
-msgstr ""
+msgstr "Belge"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
-msgstr ""
+msgstr "E-Posta..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
-msgstr ""
+msgstr "Yazdır..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
-msgstr ""
+msgstr "Yardım"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
-msgstr ""
+msgstr "Hakkında"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
-msgstr ""
+msgstr "Çık"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Daha Az"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "En Az"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "En Çok"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
diff --git a/po/ug.po b/po/ug.po
index 6cd55cb..9c6dadd 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: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -90,7 +90,7 @@ msgstr "سۈرەت"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "بەتلەرنى قايتا تىزىش"
 
@@ -208,7 +208,7 @@ msgstr "شويلىلاش"
 msgid "Save document to a file"
 msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "ساقلا"
 
@@ -250,7 +250,7 @@ msgid "Crop"
 msgstr "قىرقى"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "مايىللىق"
 
@@ -295,9 +295,17 @@ msgid "Quality:"
 msgstr "سۈپىتى:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "پۈتۈك شويلىلاش"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "شويلىلايدىغان ئۈسكۈنە"
@@ -447,12 +455,12 @@ msgid "Scanned Document"
 msgstr "شويلىلانغان ھۆججەت"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -462,7 +470,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "شويلىلانغان Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "ياپ(_C)"
 
@@ -483,7 +491,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
@@ -536,52 +544,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "تەرەپلەرنى بىرىكتۈرۈش(ئەسكىچە)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "ئەكسىچە"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "ئۆزگەرمىسۇن"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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 +620,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -635,106 +643,106 @@ msgstr ""
 "  umar tumur https://launchpad.net/~umar-tumur"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "يېڭى پۈتۈك"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "پۈتۈك"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "ئېلخەت…"
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "باس…"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "ياردەم"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "ئاخىرلاشتۇر"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "كىچىك"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
diff --git a/po/uk.po b/po/uk.po
index 253a09d..a8801de 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Фотографія"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Перевпорядкувати сторінки"
 
@@ -205,7 +205,7 @@ msgstr "Сканувати"
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Зберегти"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Обрізати"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Налаштування"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Якість:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканувати документи"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Пристрій сканування"
@@ -444,12 +452,12 @@ msgid "Scanned Document"
 msgstr "Сканований документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -460,7 +468,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "За_крити"
 
@@ -481,7 +489,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Зберегти як..."
 
@@ -534,52 +542,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "З’єднувати збоку"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "З’єднувати збоку (у зворотному порядку)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "У зворотному порядку"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Не змінювати"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -608,16 +616,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -627,106 +635,106 @@ msgstr ""
 "  passtas https://launchpad.net/~passtas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Новий документ"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Надіслати ел. поштою…"
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Надрукувати…"
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Довідка"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "Про програму"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Вийти"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
diff --git a/po/ur.po b/po/ur.po
index 4527159..97b7f8d 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "تصویر"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "محفوظ کریں"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "ترجیحات"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -449,7 +457,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -585,16 +593,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -603,106 +611,106 @@ msgstr ""
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 0d86924..48a1743 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Rasm"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "Skan qilish"
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Saqlash"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Kesish"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Мослашлар"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -451,7 +459,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -472,7 +480,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr ""
 
@@ -525,52 +533,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -587,122 +595,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index f0aa5a1..554e4f6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Ảnh chụp"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Tùy thích"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Chất lượng:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
@@ -438,12 +446,12 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Công cụ quét hình"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -453,7 +461,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr ""
 
@@ -474,7 +482,7 @@ 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:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Lưu thành..."
 
@@ -527,52 +535,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 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:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -601,16 +609,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -619,106 +627,106 @@ 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:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b9aa74d..dfcbd01 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "照片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr "扫描"
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "保存"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "首选项"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "质量："
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "扫描文档"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "扫描设备"
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr "扫描的文档"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
@@ -449,7 +457,7 @@ msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "保存为..."
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "放弃更改"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -594,16 +602,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -624,106 +632,106 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f90cbf7..254182e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+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: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "相片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
@@ -205,7 +205,7 @@ msgstr "掃描"
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "儲存"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "裁切"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "品質："
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "掃描文件"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "要從哪個裝置掃描"
@@ -435,12 +443,12 @@ msgid "Scanned Document"
 msgstr "掃描的文件"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
@@ -449,7 +457,7 @@ msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -470,7 +478,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "另存為..."
 
@@ -523,52 +531,52 @@ 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:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -591,16 +599,16 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -613,106 +621,106 @@ msgstr ""
 "  nckuhuahua https://launchpad.net/~nckuhuahua"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, 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:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "新文件"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "文件"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "電子郵件..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "列印..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "求助"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "關於"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "結束"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "較深"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "較淺"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index de3f9ca..180f22a 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.24.0, the Vala compiler
+/* autosave-manager.c generated by valac 0.26.1, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
@@ -150,9 +150,9 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
 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 ___lambda3_ (AutosaveManager* self);
+static gboolean ___lambda4_ (AutosaveManager* self);
 static void autosave_manager_real_save (AutosaveManager* self);
-static gboolean ____lambda3__gsource_func (gpointer self);
+static gboolean ____lambda4__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);
@@ -275,7 +275,7 @@ void autosave_manager_load (AutosaveManager* self) {
 #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) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 280 "autosave-manager.c"
 			goto __catch27_g_error;
 		}
@@ -315,7 +315,7 @@ void autosave_manager_load (AutosaveManager* self) {
 	}
 	__finally27:
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #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"
@@ -719,7 +719,7 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_pixels_size_ = pixels_length1;
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						if (_inner_error_ != NULL) {
+						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 723 "autosave-manager.c"
 							goto __catch28_g_error;
 						}
@@ -758,7 +758,7 @@ void autosave_manager_load (AutosaveManager* self) {
 					}
 					__finally28:
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (_inner_error_ != NULL) {
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -912,7 +912,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 916 "autosave-manager.c"
 			goto __catch29_g_error;
 		}
@@ -990,7 +990,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "autosave-manager.c"
 			goto __catch30_g_error;
 		}
@@ -1059,7 +1059,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1063 "autosave-manager.c"
 			goto __catch31_g_error;
 		}
@@ -1134,7 +1134,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = _tmp4_;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1138 "autosave-manager.c"
 			goto __catch32_g_error;
 		}
@@ -1176,7 +1176,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 	}
 	__finally32:
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1377,7 +1377,7 @@ void autosave_manager_on_cleared (AutosaveManager* self) {
 }
 
 
-static gboolean ___lambda3_ (AutosaveManager* self) {
+static gboolean ___lambda4_ (AutosaveManager* self) {
 	gboolean result = FALSE;
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_real_save (self);
@@ -1391,9 +1391,9 @@ static gboolean ___lambda3_ (AutosaveManager* self) {
 }
 
 
-static gboolean ____lambda3__gsource_func (gpointer self) {
+static gboolean ____lambda4__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda3_ ((AutosaveManager*) self);
+	result = ___lambda4_ ((AutosaveManager*) self);
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
 #line 1399 "autosave-manager.c"
@@ -1450,7 +1450,7 @@ static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
 #line 1450 "autosave-manager.c"
 		guint _tmp6_ = 0U;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda3__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
+		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda4__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		self->priv->update_timeout = _tmp6_;
 #line 1456 "autosave-manager.c"
@@ -1988,7 +1988,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (_tmp115_);
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1992 "autosave-manager.c"
 			goto __catch33_g_error;
 		}
@@ -2015,7 +2015,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 	}
 	__finally33:
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (page_names);
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2100,7 +2100,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2104 "autosave-manager.c"
 			goto __catch34_g_error;
 		}
@@ -2127,7 +2127,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 	}
 	__finally34:
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_object_unref0 (file);
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2599,7 +2599,7 @@ static void autosave_manager_class_init (AutosaveManagerClass * klass) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_parent_class = g_type_class_peek_parent (klass);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	AUTOSAVE_MANAGER_CLASS (klass)->finalize = autosave_manager_finalize;
+	((AutosaveManagerClass *) klass)->finalize = autosave_manager_finalize;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_type_class_add_private (klass, sizeof (AutosaveManagerPrivate));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2641,11 +2641,13 @@ static void autosave_manager_finalize (AutosaveManager* obj) {
 	AutosaveManager * self;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AUTOSAVE_MANAGER, AutosaveManager);
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_destroy (self);
 #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 2648 "autosave-manager.c"
+#line 2650 "autosave-manager.c"
 }
 
 
@@ -2670,7 +2672,7 @@ gpointer autosave_manager_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return instance;
-#line 2673 "autosave-manager.c"
+#line 2675 "autosave-manager.c"
 }
 
 
@@ -2683,7 +2685,7 @@ void autosave_manager_unref (gpointer instance) {
 		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2686 "autosave-manager.c"
+#line 2688 "autosave-manager.c"
 	}
 }
 
diff --git a/src/book-view.c b/src/book-view.c
index 4ae0fd2..dbfdba3 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.24.0, the Vala compiler
+/* book-view.c generated by valac 0.26.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
@@ -3739,55 +3739,55 @@ static void book_view_finalize (GObject* obj) {
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->drawing_area;
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("configure-event", GTK_TYPE_WIDGET, &_tmp9_, NULL, FALSE);
+	g_signal_parse_name ("configure-event", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self);
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = self->priv->drawing_area;
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("draw", GTK_TYPE_WIDGET, &_tmp11_, NULL, FALSE);
+	g_signal_parse_name ("draw", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _book_view_draw_cb_gtk_widget_draw, self);
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->drawing_area;
 #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);
+	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = self->priv->drawing_area;
 #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);
+	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp15_, NULL, FALSE);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = self->priv->drawing_area;
 #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);
+	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp17_, NULL, FALSE);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self);
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = self->priv->drawing_area;
 #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);
+	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = self->priv->drawing_area;
 #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);
+	g_signal_parse_name ("focus-in-event", gtk_widget_get_type (), &_tmp21_, NULL, FALSE);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = self->priv->drawing_area;
 #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);
+	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp23_, NULL, FALSE);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self);
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->adjustment;
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_parse_name ("value-changed", GTK_TYPE_ADJUSTMENT, &_tmp25_, NULL, FALSE);
+	g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp25_, NULL, FALSE);
 #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"
@@ -3813,7 +3813,7 @@ 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_BOX, "BookView", &g_define_type_info, 0);
+		book_view_type_id = g_type_register_static (gtk_box_get_type (), "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;
diff --git a/src/book.c b/src/book.c
index 45fd555..8bfd63a 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.24.0, the Vala compiler
+/* book.c generated by valac 0.26.1, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -832,33 +832,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 850 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
 #line 858 "book.c"
 	} else {
-#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
 #line 864 "book.c"
 	}
@@ -882,103 +882,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1226 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1230 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 898 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 907 "book.c"
 	}
-#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 913 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 922 "book.c"
 	}
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 928 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 937 "book.c"
 	} else {
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 941 "book.c"
 	}
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 949 "book.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 958 "book.c"
 	} else {
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 962 "book.c"
 	}
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
 #line 984 "book.c"
 }
@@ -1298,7 +1298,7 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp12_);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1391,7 +1391,7 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1834,7 +1834,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 #line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		gdk_pixbuf_save_to_callbackv (_tmp14_, _book_write_pixbuf_data_gdk_pixbuf_save_func, self, "jpeg", keys, values, &_inner_error_);
 #line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1839 "book.c"
 			goto __catch0_g_error;
 		}
@@ -1853,7 +1853,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	}
 	__finally0:
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -2121,7 +2121,7 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp10_;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4318,7 +4318,7 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4342,7 +4342,7 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps (self, _tmp7_, &_inner_error_);
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4369,7 +4369,7 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4659,7 +4659,7 @@ static void book_class_init (BookClass * klass) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	BOOK_CLASS (klass)->finalize = book_finalize;
+	((BookClass *) klass)->finalize = book_finalize;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (BookPrivate));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4692,9 +4692,11 @@ static void book_finalize (Book* obj) {
 	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 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_handlers_destroy (self);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 4698 "book.c"
+#line 4700 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -4702,14 +4704,14 @@ static void book_finalize (Book* obj) {
 		page_collection = _tmp0_;
 #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 4706 "book.c"
+#line 4708 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
-#line 4713 "book.c"
+#line 4715 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -4729,7 +4731,7 @@ static void book_finalize (Book* obj) {
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 4733 "book.c"
+#line 4735 "book.c"
 			}
 		}
 	}
@@ -4737,7 +4739,7 @@ static void book_finalize (Book* obj) {
 	__g_list_free__page_unref0_0 (self->priv->pages);
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 4741 "book.c"
+#line 4743 "book.c"
 }
 
 
@@ -4762,7 +4764,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 4766 "book.c"
+#line 4768 "book.c"
 }
 
 
@@ -4775,7 +4777,7 @@ 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 4779 "book.c"
+#line 4781 "book.c"
 	}
 }
 
@@ -4783,7 +4785,7 @@ void book_unref (gpointer instance) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4787 "book.c"
+#line 4789 "book.c"
 }
 
 
@@ -4805,14 +4807,14 @@ PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	self->priv->stream = _tmp1_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 4809 "book.c"
+#line 4811 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
-#line 4816 "book.c"
+#line 4818 "book.c"
 }
 
 
@@ -4823,7 +4825,7 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	GError * _inner_error_ = NULL;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 4827 "book.c"
+#line 4829 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
@@ -4837,8 +4839,8 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_inner_error_ != NULL) {
-#line 4842 "book.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4844 "book.c"
 			goto __catch1_g_error;
 		}
 	}
@@ -4860,18 +4862,18 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 		g_warning ("book.vala:591: Error writing PDF: %s", _tmp3_);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 4864 "book.c"
+#line 4866 "book.c"
 	}
 	__finally1:
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4875 "book.c"
+#line 4877 "book.c"
 	}
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
@@ -4881,7 +4883,7 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	_tmp5__length1 = data_length1;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
-#line 4885 "book.c"
+#line 4887 "book.c"
 }
 
 
@@ -4900,49 +4902,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1303 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 4940 "book.c"
+#line 4942 "book.c"
 	}
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 4946 "book.c"
+#line 4948 "book.c"
 }
 
 
@@ -4968,7 +4970,7 @@ void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 4972 "book.c"
+#line 4974 "book.c"
 }
 
 
@@ -4991,14 +4993,14 @@ guint pdf_writer_start_object (PDFWriter* self) {
 	result = _tmp2_;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4995 "book.c"
+#line 4997 "book.c"
 }
 
 
 static void value_pdf_writer_init (GValue* value) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 5002 "book.c"
+#line 5004 "book.c"
 }
 
 
@@ -5007,7 +5009,7 @@ static void value_pdf_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
-#line 5011 "book.c"
+#line 5013 "book.c"
 	}
 }
 
@@ -5017,11 +5019,11 @@ static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_v
 	if (src_value->data[0].v_pointer) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = pdf_writer_ref (src_value->data[0].v_pointer);
-#line 5021 "book.c"
+#line 5023 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5025 "book.c"
+#line 5027 "book.c"
 	}
 }
 
@@ -5029,37 +5031,37 @@ static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_v
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5033 "book.c"
+#line 5035 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5040 "book.c"
+#line 5042 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5047 "book.c"
+#line 5049 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 572 "/home/bob/bzr/simple-scan/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 5051 "book.c"
+#line 5053 "book.c"
 		}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
-#line 5055 "book.c"
+#line 5057 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5059 "book.c"
+#line 5061 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5063 "book.c"
+#line 5065 "book.c"
 }
 
 
@@ -5070,25 +5072,25 @@ static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect
 	if (!object_p) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5074 "book.c"
+#line 5076 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5080 "book.c"
+#line 5082 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5084 "book.c"
+#line 5086 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
-#line 5088 "book.c"
+#line 5090 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5092 "book.c"
+#line 5094 "book.c"
 }
 
 
@@ -5102,7 +5104,7 @@ GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const g
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5106 "book.c"
+#line 5108 "book.c"
 }
 
 
@@ -5111,7 +5113,7 @@ gpointer value_get_pdf_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER), NULL);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5115 "book.c"
+#line 5117 "book.c"
 }
 
 
@@ -5131,17 +5133,17 @@ void value_set_pdf_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
-#line 5135 "book.c"
+#line 5137 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5139 "book.c"
+#line 5141 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 5145 "book.c"
+#line 5147 "book.c"
 	}
 }
 
@@ -5160,17 +5162,17 @@ void value_take_pdf_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5164 "book.c"
+#line 5166 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5168 "book.c"
+#line 5170 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 5174 "book.c"
+#line 5176 "book.c"
 	}
 }
 
@@ -5179,10 +5181,10 @@ static void pdf_writer_class_init (PDFWriterClass * klass) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	PDF_WRITER_CLASS (klass)->finalize = pdf_writer_finalize;
+	((PDFWriterClass *) klass)->finalize = pdf_writer_finalize;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
-#line 5186 "book.c"
+#line 5188 "book.c"
 }
 
 
@@ -5193,7 +5195,7 @@ static void pdf_writer_instance_init (PDFWriter * self) {
 	self->offset = (gsize) 0;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5197 "book.c"
+#line 5199 "book.c"
 }
 
 
@@ -5201,11 +5203,13 @@ static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_handlers_destroy (self);
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_list_free0 (self->object_offsets);
 #line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 5209 "book.c"
+#line 5213 "book.c"
 }
 
 
@@ -5230,7 +5234,7 @@ gpointer pdf_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5234 "book.c"
+#line 5238 "book.c"
 }
 
 
@@ -5243,7 +5247,7 @@ void pdf_writer_unref (gpointer instance) {
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5247 "book.c"
+#line 5251 "book.c"
 	}
 }
 
@@ -5253,7 +5257,7 @@ static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer s
 	result = ps_writer_write_cairo_data ((PsWriter*) self, data, data_length1);
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 5257 "book.c"
+#line 5261 "book.c"
 }
 
 
@@ -5282,14 +5286,14 @@ PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	self->surface = _tmp2_;
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 5286 "book.c"
+#line 5290 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
-#line 5293 "book.c"
+#line 5297 "book.c"
 }
 
 
@@ -5298,7 +5302,7 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 	GError * _inner_error_ = NULL;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 5302 "book.c"
+#line 5306 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
@@ -5312,8 +5316,8 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 #line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
 #line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_inner_error_ != NULL) {
-#line 5317 "book.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5321 "book.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -5339,31 +5343,31 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 		_g_error_free0 (e);
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 5343 "book.c"
+#line 5347 "book.c"
 	}
 	__finally2:
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
-#line 5354 "book.c"
+#line 5358 "book.c"
 	}
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 5360 "book.c"
+#line 5364 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 5367 "book.c"
+#line 5371 "book.c"
 }
 
 
@@ -5372,7 +5376,7 @@ static void value_ps_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
-#line 5376 "book.c"
+#line 5380 "book.c"
 	}
 }
 
@@ -5382,11 +5386,11 @@ static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = ps_writer_ref (src_value->data[0].v_pointer);
-#line 5386 "book.c"
+#line 5390 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5390 "book.c"
+#line 5394 "book.c"
 	}
 }
 
@@ -5394,37 +5398,37 @@ static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5398 "book.c"
+#line 5402 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5405 "book.c"
+#line 5409 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5412 "book.c"
+#line 5416 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 608 "/home/bob/bzr/simple-scan/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 5416 "book.c"
+#line 5420 "book.c"
 		}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
-#line 5420 "book.c"
+#line 5424 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5424 "book.c"
+#line 5428 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5428 "book.c"
+#line 5432 "book.c"
 }
 
 
@@ -5435,25 +5439,25 @@ static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5439 "book.c"
+#line 5443 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5445 "book.c"
+#line 5449 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5449 "book.c"
+#line 5453 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
-#line 5453 "book.c"
+#line 5457 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5457 "book.c"
+#line 5461 "book.c"
 }
 
 
@@ -5467,7 +5471,7 @@ GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5471 "book.c"
+#line 5475 "book.c"
 }
 
 
@@ -5476,7 +5480,7 @@ gpointer value_get_ps_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER), NULL);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5480 "book.c"
+#line 5484 "book.c"
 }
 
 
@@ -5496,17 +5500,17 @@ void value_set_ps_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
-#line 5500 "book.c"
+#line 5504 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5504 "book.c"
+#line 5508 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5510 "book.c"
+#line 5514 "book.c"
 	}
 }
 
@@ -5525,17 +5529,17 @@ void value_take_ps_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5529 "book.c"
+#line 5533 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5533 "book.c"
+#line 5537 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5539 "book.c"
+#line 5543 "book.c"
 	}
 }
 
@@ -5544,15 +5548,15 @@ static void ps_writer_class_init (PsWriterClass * klass) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	PS_WRITER_CLASS (klass)->finalize = ps_writer_finalize;
-#line 5549 "book.c"
+	((PsWriterClass *) klass)->finalize = ps_writer_finalize;
+#line 5553 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5556 "book.c"
+#line 5560 "book.c"
 }
 
 
@@ -5560,11 +5564,13 @@ static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_handlers_destroy (self);
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 5568 "book.c"
+#line 5574 "book.c"
 }
 
 
@@ -5589,7 +5595,7 @@ gpointer ps_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5593 "book.c"
+#line 5599 "book.c"
 }
 
 
@@ -5602,7 +5608,7 @@ void ps_writer_unref (gpointer instance) {
 		PS_WRITER_GET_CLASS (self)->finalize (self);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5606 "book.c"
+#line 5612 "book.c"
 	}
 }
 
diff --git a/src/page-view.c b/src/page-view.c
index 93a7130..1d9bea1 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.24.0, the Vala compiler
+/* page-view.c generated by valac 0.26.1, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
@@ -6784,7 +6784,7 @@ static void page_view_class_init (PageViewClass * klass) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_parent_class = g_type_class_peek_parent (klass);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	PAGE_VIEW_CLASS (klass)->finalize = page_view_finalize;
+	((PageViewClass *) klass)->finalize = page_view_finalize;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_type_class_add_private (klass, sizeof (PageViewPrivate));
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -6830,6 +6830,8 @@ static void page_view_finalize (PageView* obj) {
 	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 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_handlers_destroy (self);
 #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"
@@ -6864,7 +6866,7 @@ static void page_view_finalize (PageView* obj) {
 	_page_unref0 (self->priv->_page);
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_object_unref0 (self->priv->image);
-#line 6868 "page-view.c"
+#line 6870 "page-view.c"
 }
 
 
@@ -6889,7 +6891,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 6893 "page-view.c"
+#line 6895 "page-view.c"
 }
 
 
@@ -6902,7 +6904,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 6906 "page-view.c"
+#line 6908 "page-view.c"
 	}
 }
 
diff --git a/src/page.c b/src/page.c
index b65f7e2..8e47fa2 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.24.0, the Vala compiler
+/* page.c generated by valac 0.26.1, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -2711,47 +2711,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1303 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
 #line 2751 "page.c"
 	}
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
 #line 2757 "page.c"
 }
@@ -2785,7 +2785,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		contents = _tmp1_;
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2790 "page.c"
 			goto __catch3_g_error;
 		}
@@ -2818,7 +2818,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	}
 	__finally3:
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -2932,7 +2932,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	stream = _tmp1_;
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3099,7 +3099,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_save (_tmp28_, _tmp29_, "jpeg", _tmp30_, _tmp30__length1, _tmp31_, _tmp31__length1, &_inner_error_);
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			g_propagate_error (error, _inner_error_);
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3245,7 +3245,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			pixbuf_writer_save (_tmp49_, _tmp50_, "png", _tmp51_, _tmp51__length1, _tmp52_, _tmp52__length1, &_inner_error_);
 #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_inner_error_ != NULL) {
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				g_propagate_error (error, _inner_error_);
 #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3401,7 +3401,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				pixbuf_writer_save (_tmp72_, _tmp73_, "tiff", _tmp74_, _tmp74__length1, _tmp75_, _tmp75__length1, &_inner_error_);
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					g_propagate_error (error, _inner_error_);
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -4449,7 +4449,7 @@ static void page_class_init (PageClass * klass) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_parent_class = g_type_class_peek_parent (klass);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	PAGE_CLASS (klass)->finalize = page_finalize;
+	((PageClass *) klass)->finalize = page_finalize;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_type_class_add_private (klass, sizeof (PagePrivate));
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -4481,13 +4481,15 @@ 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 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_signal_handlers_destroy (self);
 #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 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_crop_name);
-#line 4491 "page.c"
+#line 4493 "page.c"
 }
 
 
@@ -4512,7 +4514,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 4516 "page.c"
+#line 4518 "page.c"
 }
 
 
@@ -4525,7 +4527,7 @@ void page_unref (gpointer instance) {
 		PAGE_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4529 "page.c"
+#line 4531 "page.c"
 	}
 }
 
@@ -4548,14 +4550,14 @@ PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* str
 	self->stream = _tmp1_;
 #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 4552 "page.c"
+#line 4554 "page.c"
 }
 
 
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
 #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
-#line 4559 "page.c"
+#line 4561 "page.c"
 }
 
 
@@ -4564,7 +4566,7 @@ static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* b
 	result = pixbuf_writer_write_pixbuf_data ((PixbufWriter*) self, buf, buf_length1, error);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4568 "page.c"
+#line 4570 "page.c"
 }
 
 
@@ -4597,12 +4599,12 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	gdk_pixbuf_save_to_callbackv (_tmp0_, _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func, self, _tmp1_, _tmp2_, _tmp3_, &_inner_error_);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 4606 "page.c"
+#line 4608 "page.c"
 	}
 }
 
@@ -4624,25 +4626,25 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return FALSE;
-#line 4633 "page.c"
+#line 4635 "page.c"
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4639 "page.c"
+#line 4641 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4646 "page.c"
+#line 4648 "page.c"
 }
 
 
@@ -4651,7 +4653,7 @@ static void value_pixbuf_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
-#line 4655 "page.c"
+#line 4657 "page.c"
 	}
 }
 
@@ -4661,11 +4663,11 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
-#line 4665 "page.c"
+#line 4667 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4669 "page.c"
+#line 4671 "page.c"
 	}
 }
 
@@ -4673,37 +4675,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4677 "page.c"
+#line 4679 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4684 "page.c"
+#line 4686 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4691 "page.c"
+#line 4693 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 692 "/home/bob/bzr/simple-scan/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 4695 "page.c"
+#line 4697 "page.c"
 		}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
-#line 4699 "page.c"
+#line 4701 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4703 "page.c"
+#line 4705 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4707 "page.c"
+#line 4709 "page.c"
 }
 
 
@@ -4714,25 +4716,25 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4718 "page.c"
+#line 4720 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4724 "page.c"
+#line 4726 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4728 "page.c"
+#line 4730 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4732 "page.c"
+#line 4734 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4736 "page.c"
+#line 4738 "page.c"
 }
 
 
@@ -4746,7 +4748,7 @@ GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4750 "page.c"
+#line 4752 "page.c"
 }
 
 
@@ -4755,7 +4757,7 @@ gpointer value_get_pixbuf_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4759 "page.c"
+#line 4761 "page.c"
 }
 
 
@@ -4775,17 +4777,17 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4779 "page.c"
+#line 4781 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4783 "page.c"
+#line 4785 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4789 "page.c"
+#line 4791 "page.c"
 	}
 }
 
@@ -4804,17 +4806,17 @@ void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4808 "page.c"
+#line 4810 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4812 "page.c"
+#line 4814 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4818 "page.c"
+#line 4820 "page.c"
 	}
 }
 
@@ -4823,15 +4825,15 @@ static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	PIXBUF_WRITER_CLASS (klass)->finalize = pixbuf_writer_finalize;
-#line 4828 "page.c"
+	((PixbufWriterClass *) klass)->finalize = pixbuf_writer_finalize;
+#line 4830 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4835 "page.c"
+#line 4837 "page.c"
 }
 
 
@@ -4839,9 +4841,11 @@ static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	PixbufWriter * self;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_signal_handlers_destroy (self);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 4845 "page.c"
+#line 4849 "page.c"
 }
 
 
@@ -4866,7 +4870,7 @@ gpointer pixbuf_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4870 "page.c"
+#line 4874 "page.c"
 }
 
 
@@ -4879,7 +4883,7 @@ void pixbuf_writer_unref (gpointer instance) {
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4883 "page.c"
+#line 4887 "page.c"
 	}
 }
 
diff --git a/src/scanner.c b/src/scanner.c
index 57323b2..0084b71 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.24.0, the Vala compiler
+/* scanner.c generated by valac 0.26.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -1176,7 +1176,7 @@ static void scan_device_class_init (ScanDeviceClass * klass) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_device_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	SCAN_DEVICE_CLASS (klass)->finalize = scan_device_finalize;
+	((ScanDeviceClass *) klass)->finalize = scan_device_finalize;
 #line 1181 "scanner.c"
 }
 
@@ -1192,11 +1192,13 @@ static void scan_device_finalize (ScanDevice* obj) {
 	ScanDevice * self;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_DEVICE, ScanDevice);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 16 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->name);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
-#line 1200 "scanner.c"
+#line 1202 "scanner.c"
 }
 
 
@@ -1221,7 +1223,7 @@ gpointer scan_device_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1225 "scanner.c"
+#line 1227 "scanner.c"
 }
 
 
@@ -1234,7 +1236,7 @@ void scan_device_unref (gpointer instance) {
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1238 "scanner.c"
+#line 1240 "scanner.c"
 	}
 }
 
@@ -1245,21 +1247,21 @@ ScanPageInfo* scan_page_info_construct (GType object_type) {
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1249 "scanner.c"
+#line 1251 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
-#line 1256 "scanner.c"
+#line 1258 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1263 "scanner.c"
+#line 1265 "scanner.c"
 }
 
 
@@ -1268,7 +1270,7 @@ static void value_scan_page_info_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
-#line 1272 "scanner.c"
+#line 1274 "scanner.c"
 	}
 }
 
@@ -1278,11 +1280,11 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_page_info_ref (src_value->data[0].v_pointer);
-#line 1282 "scanner.c"
+#line 1284 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1286 "scanner.c"
+#line 1288 "scanner.c"
 	}
 }
 
@@ -1290,37 +1292,37 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1294 "scanner.c"
+#line 1296 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1301 "scanner.c"
+#line 1303 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1308 "scanner.c"
+#line 1310 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1312 "scanner.c"
+#line 1314 "scanner.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
-#line 1316 "scanner.c"
+#line 1318 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1320 "scanner.c"
+#line 1322 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1324 "scanner.c"
+#line 1326 "scanner.c"
 }
 
 
@@ -1331,25 +1333,25 @@ static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1335 "scanner.c"
+#line 1337 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1341 "scanner.c"
+#line 1343 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1345 "scanner.c"
+#line 1347 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
-#line 1349 "scanner.c"
+#line 1351 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1353 "scanner.c"
+#line 1355 "scanner.c"
 }
 
 
@@ -1363,7 +1365,7 @@ GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1367 "scanner.c"
+#line 1369 "scanner.c"
 }
 
 
@@ -1372,7 +1374,7 @@ gpointer value_get_scan_page_info (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1376 "scanner.c"
+#line 1378 "scanner.c"
 }
 
 
@@ -1392,17 +1394,17 @@ void value_set_scan_page_info (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
-#line 1396 "scanner.c"
+#line 1398 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1400 "scanner.c"
+#line 1402 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1406 "scanner.c"
+#line 1408 "scanner.c"
 	}
 }
 
@@ -1421,17 +1423,17 @@ void value_take_scan_page_info (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1425 "scanner.c"
+#line 1427 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1429 "scanner.c"
+#line 1431 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1435 "scanner.c"
+#line 1437 "scanner.c"
 	}
 }
 
@@ -1440,15 +1442,15 @@ static void scan_page_info_class_init (ScanPageInfoClass * klass) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_page_info_parent_class = g_type_class_peek_parent (klass);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	SCAN_PAGE_INFO_CLASS (klass)->finalize = scan_page_info_finalize;
-#line 1445 "scanner.c"
+	((ScanPageInfoClass *) klass)->finalize = scan_page_info_finalize;
+#line 1447 "scanner.c"
 }
 
 
 static void scan_page_info_instance_init (ScanPageInfo * self) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1452 "scanner.c"
+#line 1454 "scanner.c"
 }
 
 
@@ -1456,9 +1458,11 @@ static void scan_page_info_finalize (ScanPageInfo* obj) {
 	ScanPageInfo * self;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_PAGE_INFO, ScanPageInfo);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 1462 "scanner.c"
+#line 1466 "scanner.c"
 }
 
 
@@ -1483,7 +1487,7 @@ gpointer scan_page_info_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1487 "scanner.c"
+#line 1491 "scanner.c"
 }
 
 
@@ -1496,7 +1500,7 @@ void scan_page_info_unref (gpointer instance) {
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1500 "scanner.c"
+#line 1504 "scanner.c"
 	}
 }
 
@@ -1507,21 +1511,21 @@ ScanLine* scan_line_construct (GType object_type) {
 	self = (ScanLine*) g_type_create_instance (object_type);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1511 "scanner.c"
+#line 1515 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
-#line 1518 "scanner.c"
+#line 1522 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1525 "scanner.c"
+#line 1529 "scanner.c"
 }
 
 
@@ -1530,7 +1534,7 @@ static void value_scan_line_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
-#line 1534 "scanner.c"
+#line 1538 "scanner.c"
 	}
 }
 
@@ -1540,11 +1544,11 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_line_ref (src_value->data[0].v_pointer);
-#line 1544 "scanner.c"
+#line 1548 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1548 "scanner.c"
+#line 1552 "scanner.c"
 	}
 }
 
@@ -1552,37 +1556,37 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_scan_line_peek_pointer (const GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1556 "scanner.c"
+#line 1560 "scanner.c"
 }
 
 
 static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1563 "scanner.c"
+#line 1567 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1570 "scanner.c"
+#line 1574 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1574 "scanner.c"
+#line 1578 "scanner.c"
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
-#line 1578 "scanner.c"
+#line 1582 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1582 "scanner.c"
+#line 1586 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1586 "scanner.c"
+#line 1590 "scanner.c"
 }
 
 
@@ -1593,25 +1597,25 @@ static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1597 "scanner.c"
+#line 1601 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1603 "scanner.c"
+#line 1607 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1607 "scanner.c"
+#line 1611 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
-#line 1611 "scanner.c"
+#line 1615 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1615 "scanner.c"
+#line 1619 "scanner.c"
 }
 
 
@@ -1625,7 +1629,7 @@ GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1629 "scanner.c"
+#line 1633 "scanner.c"
 }
 
 
@@ -1634,7 +1638,7 @@ gpointer value_get_scan_line (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1638 "scanner.c"
+#line 1642 "scanner.c"
 }
 
 
@@ -1654,17 +1658,17 @@ void value_set_scan_line (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
-#line 1658 "scanner.c"
+#line 1662 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1662 "scanner.c"
+#line 1666 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1668 "scanner.c"
+#line 1672 "scanner.c"
 	}
 }
 
@@ -1683,17 +1687,17 @@ void value_take_scan_line (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1687 "scanner.c"
+#line 1691 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1691 "scanner.c"
+#line 1695 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1697 "scanner.c"
+#line 1701 "scanner.c"
 	}
 }
 
@@ -1702,15 +1706,15 @@ static void scan_line_class_init (ScanLineClass * klass) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_line_parent_class = g_type_class_peek_parent (klass);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	SCAN_LINE_CLASS (klass)->finalize = scan_line_finalize;
-#line 1707 "scanner.c"
+	((ScanLineClass *) klass)->finalize = scan_line_finalize;
+#line 1711 "scanner.c"
 }
 
 
 static void scan_line_instance_init (ScanLine * self) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1714 "scanner.c"
+#line 1718 "scanner.c"
 }
 
 
@@ -1718,9 +1722,11 @@ static void scan_line_finalize (ScanLine* obj) {
 	ScanLine * self;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_LINE, ScanLine);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
-#line 1724 "scanner.c"
+#line 1730 "scanner.c"
 }
 
 
@@ -1745,7 +1751,7 @@ gpointer scan_line_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1749 "scanner.c"
+#line 1755 "scanner.c"
 }
 
 
@@ -1758,7 +1764,7 @@ void scan_line_unref (gpointer instance) {
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1762 "scanner.c"
+#line 1768 "scanner.c"
 	}
 }
 
@@ -1793,21 +1799,21 @@ ScanOptions* scan_options_construct (GType object_type) {
 	self = (ScanOptions*) g_type_create_instance (object_type);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1797 "scanner.c"
+#line 1803 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
-#line 1804 "scanner.c"
+#line 1810 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1811 "scanner.c"
+#line 1817 "scanner.c"
 }
 
 
@@ -1816,7 +1822,7 @@ static void value_scan_options_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
-#line 1820 "scanner.c"
+#line 1826 "scanner.c"
 	}
 }
 
@@ -1826,11 +1832,11 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_options_ref (src_value->data[0].v_pointer);
-#line 1830 "scanner.c"
+#line 1836 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1834 "scanner.c"
+#line 1840 "scanner.c"
 	}
 }
 
@@ -1838,37 +1844,37 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_scan_options_peek_pointer (const GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1842 "scanner.c"
+#line 1848 "scanner.c"
 }
 
 
 static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1849 "scanner.c"
+#line 1855 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1856 "scanner.c"
+#line 1862 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1860 "scanner.c"
+#line 1866 "scanner.c"
 		}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
-#line 1864 "scanner.c"
+#line 1870 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1868 "scanner.c"
+#line 1874 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1872 "scanner.c"
+#line 1878 "scanner.c"
 }
 
 
@@ -1879,25 +1885,25 @@ static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1883 "scanner.c"
+#line 1889 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1889 "scanner.c"
+#line 1895 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1893 "scanner.c"
+#line 1899 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
-#line 1897 "scanner.c"
+#line 1903 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1901 "scanner.c"
+#line 1907 "scanner.c"
 }
 
 
@@ -1911,7 +1917,7 @@ GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1915 "scanner.c"
+#line 1921 "scanner.c"
 }
 
 
@@ -1920,7 +1926,7 @@ gpointer value_get_scan_options (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1924 "scanner.c"
+#line 1930 "scanner.c"
 }
 
 
@@ -1940,17 +1946,17 @@ void value_set_scan_options (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
-#line 1944 "scanner.c"
+#line 1950 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1948 "scanner.c"
+#line 1954 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1954 "scanner.c"
+#line 1960 "scanner.c"
 	}
 }
 
@@ -1969,17 +1975,17 @@ void value_take_scan_options (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1973 "scanner.c"
+#line 1979 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1977 "scanner.c"
+#line 1983 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1983 "scanner.c"
+#line 1989 "scanner.c"
 	}
 }
 
@@ -1988,15 +1994,15 @@ static void scan_options_class_init (ScanOptionsClass * klass) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_options_parent_class = g_type_class_peek_parent (klass);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	SCAN_OPTIONS_CLASS (klass)->finalize = scan_options_finalize;
-#line 1993 "scanner.c"
+	((ScanOptionsClass *) klass)->finalize = scan_options_finalize;
+#line 1999 "scanner.c"
 }
 
 
 static void scan_options_instance_init (ScanOptions * self) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2000 "scanner.c"
+#line 2006 "scanner.c"
 }
 
 
@@ -2004,7 +2010,9 @@ static void scan_options_finalize (ScanOptions* obj) {
 	ScanOptions * self;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
-#line 2008 "scanner.c"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
+#line 2016 "scanner.c"
 }
 
 
@@ -2029,7 +2037,7 @@ gpointer scan_options_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2033 "scanner.c"
+#line 2041 "scanner.c"
 }
 
 
@@ -2042,7 +2050,7 @@ void scan_options_unref (gpointer instance) {
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2046 "scanner.c"
+#line 2054 "scanner.c"
 	}
 }
 
@@ -2053,21 +2061,21 @@ ScanJob* scan_job_construct (GType object_type) {
 	self = (ScanJob*) g_type_create_instance (object_type);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2057 "scanner.c"
+#line 2065 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
-#line 2064 "scanner.c"
+#line 2072 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2071 "scanner.c"
+#line 2079 "scanner.c"
 }
 
 
@@ -2076,7 +2084,7 @@ static void value_scan_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
-#line 2080 "scanner.c"
+#line 2088 "scanner.c"
 	}
 }
 
@@ -2086,11 +2094,11 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_job_ref (src_value->data[0].v_pointer);
-#line 2090 "scanner.c"
+#line 2098 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2094 "scanner.c"
+#line 2102 "scanner.c"
 	}
 }
 
@@ -2098,37 +2106,37 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_scan_job_peek_pointer (const GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2102 "scanner.c"
+#line 2110 "scanner.c"
 }
 
 
 static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2109 "scanner.c"
+#line 2117 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2116 "scanner.c"
+#line 2124 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2120 "scanner.c"
+#line 2128 "scanner.c"
 		}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
-#line 2124 "scanner.c"
+#line 2132 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2128 "scanner.c"
+#line 2136 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2132 "scanner.c"
+#line 2140 "scanner.c"
 }
 
 
@@ -2139,25 +2147,25 @@ static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2143 "scanner.c"
+#line 2151 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2149 "scanner.c"
+#line 2157 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2153 "scanner.c"
+#line 2161 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
-#line 2157 "scanner.c"
+#line 2165 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2161 "scanner.c"
+#line 2169 "scanner.c"
 }
 
 
@@ -2171,7 +2179,7 @@ GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2175 "scanner.c"
+#line 2183 "scanner.c"
 }
 
 
@@ -2180,7 +2188,7 @@ gpointer value_get_scan_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2184 "scanner.c"
+#line 2192 "scanner.c"
 }
 
 
@@ -2200,17 +2208,17 @@ void value_set_scan_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
-#line 2204 "scanner.c"
+#line 2212 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2208 "scanner.c"
+#line 2216 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2214 "scanner.c"
+#line 2222 "scanner.c"
 	}
 }
 
@@ -2229,17 +2237,17 @@ void value_take_scan_job (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2233 "scanner.c"
+#line 2241 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2237 "scanner.c"
+#line 2245 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2243 "scanner.c"
+#line 2251 "scanner.c"
 	}
 }
 
@@ -2248,15 +2256,15 @@ static void scan_job_class_init (ScanJobClass * klass) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_job_parent_class = g_type_class_peek_parent (klass);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	SCAN_JOB_CLASS (klass)->finalize = scan_job_finalize;
-#line 2253 "scanner.c"
+	((ScanJobClass *) klass)->finalize = scan_job_finalize;
+#line 2261 "scanner.c"
 }
 
 
 static void scan_job_instance_init (ScanJob * self) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2260 "scanner.c"
+#line 2268 "scanner.c"
 }
 
 
@@ -2264,9 +2272,11 @@ static void scan_job_finalize (ScanJob* obj) {
 	ScanJob * self;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_JOB, ScanJob);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 2270 "scanner.c"
+#line 2280 "scanner.c"
 }
 
 
@@ -2291,7 +2301,7 @@ gpointer scan_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2295 "scanner.c"
+#line 2305 "scanner.c"
 }
 
 
@@ -2304,7 +2314,7 @@ void scan_job_unref (gpointer instance) {
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2308 "scanner.c"
+#line 2318 "scanner.c"
 	}
 }
 
@@ -2315,21 +2325,21 @@ Request* request_construct (GType object_type) {
 	self = (Request*) g_type_create_instance (object_type);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2319 "scanner.c"
+#line 2329 "scanner.c"
 }
 
 
 Request* request_new (void) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
-#line 2326 "scanner.c"
+#line 2336 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2333 "scanner.c"
+#line 2343 "scanner.c"
 }
 
 
@@ -2338,7 +2348,7 @@ static void value_request_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
-#line 2342 "scanner.c"
+#line 2352 "scanner.c"
 	}
 }
 
@@ -2348,11 +2358,11 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = request_ref (src_value->data[0].v_pointer);
-#line 2352 "scanner.c"
+#line 2362 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2356 "scanner.c"
+#line 2366 "scanner.c"
 	}
 }
 
@@ -2360,37 +2370,37 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_request_peek_pointer (const GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2364 "scanner.c"
+#line 2374 "scanner.c"
 }
 
 
 static gchar* value_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2371 "scanner.c"
+#line 2381 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2378 "scanner.c"
+#line 2388 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2382 "scanner.c"
+#line 2392 "scanner.c"
 		}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
-#line 2386 "scanner.c"
+#line 2396 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2390 "scanner.c"
+#line 2400 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2394 "scanner.c"
+#line 2404 "scanner.c"
 }
 
 
@@ -2401,25 +2411,25 @@ static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2405 "scanner.c"
+#line 2415 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2411 "scanner.c"
+#line 2421 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2415 "scanner.c"
+#line 2425 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
-#line 2419 "scanner.c"
+#line 2429 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2423 "scanner.c"
+#line 2433 "scanner.c"
 }
 
 
@@ -2433,7 +2443,7 @@ GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2437 "scanner.c"
+#line 2447 "scanner.c"
 }
 
 
@@ -2442,7 +2452,7 @@ gpointer value_get_request (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2446 "scanner.c"
+#line 2456 "scanner.c"
 }
 
 
@@ -2462,17 +2472,17 @@ void value_set_request (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
-#line 2466 "scanner.c"
+#line 2476 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2470 "scanner.c"
+#line 2480 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2476 "scanner.c"
+#line 2486 "scanner.c"
 	}
 }
 
@@ -2491,17 +2501,17 @@ void value_take_request (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2495 "scanner.c"
+#line 2505 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2499 "scanner.c"
+#line 2509 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2505 "scanner.c"
+#line 2515 "scanner.c"
 	}
 }
 
@@ -2510,15 +2520,15 @@ static void request_class_init (RequestClass * klass) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_parent_class = g_type_class_peek_parent (klass);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	REQUEST_CLASS (klass)->finalize = request_finalize;
-#line 2515 "scanner.c"
+	((RequestClass *) klass)->finalize = request_finalize;
+#line 2525 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2522 "scanner.c"
+#line 2532 "scanner.c"
 }
 
 
@@ -2526,7 +2536,9 @@ static void request_finalize (Request* obj) {
 	Request * self;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
-#line 2530 "scanner.c"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
+#line 2542 "scanner.c"
 }
 
 
@@ -2551,7 +2563,7 @@ gpointer request_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2555 "scanner.c"
+#line 2567 "scanner.c"
 }
 
 
@@ -2564,7 +2576,7 @@ void request_unref (gpointer instance) {
 		REQUEST_GET_CLASS (self)->finalize (self);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2568 "scanner.c"
+#line 2580 "scanner.c"
 	}
 }
 
@@ -2575,21 +2587,21 @@ RequestRedetect* request_redetect_construct (GType object_type) {
 	self = (RequestRedetect*) request_construct (object_type);
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2579 "scanner.c"
+#line 2591 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
-#line 2586 "scanner.c"
+#line 2598 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
-#line 2593 "scanner.c"
+#line 2605 "scanner.c"
 }
 
 
@@ -2615,21 +2627,21 @@ RequestCancel* request_cancel_construct (GType object_type) {
 	self = (RequestCancel*) request_construct (object_type);
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2619 "scanner.c"
+#line 2631 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
-#line 2626 "scanner.c"
+#line 2638 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
-#line 2633 "scanner.c"
+#line 2645 "scanner.c"
 }
 
 
@@ -2655,14 +2667,14 @@ RequestStartScan* request_start_scan_construct (GType object_type) {
 	self = (RequestStartScan*) request_construct (object_type);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2659 "scanner.c"
+#line 2671 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
-#line 2666 "scanner.c"
+#line 2678 "scanner.c"
 }
 
 
@@ -2670,8 +2682,8 @@ static void request_start_scan_class_init (RequestStartScanClass * klass) {
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_start_scan_parent_class = g_type_class_peek_parent (klass);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	REQUEST_CLASS (klass)->finalize = request_start_scan_finalize;
-#line 2675 "scanner.c"
+	((RequestClass *) klass)->finalize = request_start_scan_finalize;
+#line 2687 "scanner.c"
 }
 
 
@@ -2687,7 +2699,7 @@ static void request_start_scan_finalize (Request* obj) {
 	_scan_job_unref0 (self->job);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
-#line 2691 "scanner.c"
+#line 2703 "scanner.c"
 }
 
 
@@ -2709,21 +2721,21 @@ RequestQuit* request_quit_construct (GType object_type) {
 	self = (RequestQuit*) request_construct (object_type);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2713 "scanner.c"
+#line 2725 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
-#line 2720 "scanner.c"
+#line 2732 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
-#line 2727 "scanner.c"
+#line 2739 "scanner.c"
 }
 
 
@@ -2749,21 +2761,21 @@ Credentials* credentials_construct (GType object_type) {
 	self = (Credentials*) g_type_create_instance (object_type);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2753 "scanner.c"
+#line 2765 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
-#line 2760 "scanner.c"
+#line 2772 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2767 "scanner.c"
+#line 2779 "scanner.c"
 }
 
 
@@ -2772,7 +2784,7 @@ static void value_credentials_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
-#line 2776 "scanner.c"
+#line 2788 "scanner.c"
 	}
 }
 
@@ -2782,11 +2794,11 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = credentials_ref (src_value->data[0].v_pointer);
-#line 2786 "scanner.c"
+#line 2798 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2790 "scanner.c"
+#line 2802 "scanner.c"
 	}
 }
 
@@ -2794,37 +2806,37 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_credentials_peek_pointer (const GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2798 "scanner.c"
+#line 2810 "scanner.c"
 }
 
 
 static gchar* value_credentials_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2805 "scanner.c"
+#line 2817 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2812 "scanner.c"
+#line 2824 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2816 "scanner.c"
+#line 2828 "scanner.c"
 		}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
-#line 2820 "scanner.c"
+#line 2832 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2824 "scanner.c"
+#line 2836 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2828 "scanner.c"
+#line 2840 "scanner.c"
 }
 
 
@@ -2835,25 +2847,25 @@ static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2839 "scanner.c"
+#line 2851 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2845 "scanner.c"
+#line 2857 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2849 "scanner.c"
+#line 2861 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
-#line 2853 "scanner.c"
+#line 2865 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2857 "scanner.c"
+#line 2869 "scanner.c"
 }
 
 
@@ -2867,7 +2879,7 @@ GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2871 "scanner.c"
+#line 2883 "scanner.c"
 }
 
 
@@ -2876,7 +2888,7 @@ gpointer value_get_credentials (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2880 "scanner.c"
+#line 2892 "scanner.c"
 }
 
 
@@ -2896,17 +2908,17 @@ void value_set_credentials (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
-#line 2900 "scanner.c"
+#line 2912 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2904 "scanner.c"
+#line 2916 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2910 "scanner.c"
+#line 2922 "scanner.c"
 	}
 }
 
@@ -2925,17 +2937,17 @@ void value_take_credentials (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2929 "scanner.c"
+#line 2941 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2933 "scanner.c"
+#line 2945 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2939 "scanner.c"
+#line 2951 "scanner.c"
 	}
 }
 
@@ -2944,15 +2956,15 @@ static void credentials_class_init (CredentialsClass * klass) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials_parent_class = g_type_class_peek_parent (klass);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	CREDENTIALS_CLASS (klass)->finalize = credentials_finalize;
-#line 2949 "scanner.c"
+	((CredentialsClass *) klass)->finalize = credentials_finalize;
+#line 2961 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2956 "scanner.c"
+#line 2968 "scanner.c"
 }
 
 
@@ -2960,11 +2972,13 @@ static void credentials_finalize (Credentials* obj) {
 	Credentials * self;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CREDENTIALS, Credentials);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->username);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
-#line 2968 "scanner.c"
+#line 2982 "scanner.c"
 }
 
 
@@ -2989,7 +3003,7 @@ gpointer credentials_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2993 "scanner.c"
+#line 3007 "scanner.c"
 }
 
 
@@ -3002,7 +3016,7 @@ void credentials_unref (gpointer instance) {
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3006 "scanner.c"
+#line 3020 "scanner.c"
 	}
 }
 
@@ -3022,7 +3036,7 @@ GType scan_state_get_type (void) {
 static void notify_real_run (Notify* self, Scanner* scanner) {
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 3026 "scanner.c"
+#line 3040 "scanner.c"
 }
 
 
@@ -3031,7 +3045,7 @@ void notify_run (Notify* self, Scanner* scanner) {
 	g_return_if_fail (self != NULL);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
-#line 3035 "scanner.c"
+#line 3049 "scanner.c"
 }
 
 
@@ -3041,21 +3055,21 @@ Notify* notify_construct (GType object_type) {
 	self = (Notify*) g_type_create_instance (object_type);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3045 "scanner.c"
+#line 3059 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
-#line 3052 "scanner.c"
+#line 3066 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 3059 "scanner.c"
+#line 3073 "scanner.c"
 }
 
 
@@ -3064,7 +3078,7 @@ static void value_notify_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
-#line 3068 "scanner.c"
+#line 3082 "scanner.c"
 	}
 }
 
@@ -3074,11 +3088,11 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 	if (src_value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = notify_ref (src_value->data[0].v_pointer);
-#line 3078 "scanner.c"
+#line 3092 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3082 "scanner.c"
+#line 3096 "scanner.c"
 	}
 }
 
@@ -3086,37 +3100,37 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 static gpointer value_notify_peek_pointer (const GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3090 "scanner.c"
+#line 3104 "scanner.c"
 }
 
 
 static gchar* value_notify_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 3097 "scanner.c"
+#line 3111 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3104 "scanner.c"
+#line 3118 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3108 "scanner.c"
+#line 3122 "scanner.c"
 		}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
-#line 3112 "scanner.c"
+#line 3126 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3116 "scanner.c"
+#line 3130 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3120 "scanner.c"
+#line 3134 "scanner.c"
 }
 
 
@@ -3127,25 +3141,25 @@ static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_val
 	if (!object_p) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3131 "scanner.c"
+#line 3145 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 3137 "scanner.c"
+#line 3151 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3141 "scanner.c"
+#line 3155 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
-#line 3145 "scanner.c"
+#line 3159 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3149 "scanner.c"
+#line 3163 "scanner.c"
 }
 
 
@@ -3159,7 +3173,7 @@ GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 3163 "scanner.c"
+#line 3177 "scanner.c"
 }
 
 
@@ -3168,7 +3182,7 @@ gpointer value_get_notify (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3172 "scanner.c"
+#line 3186 "scanner.c"
 }
 
 
@@ -3188,17 +3202,17 @@ void value_set_notify (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
-#line 3192 "scanner.c"
+#line 3206 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3196 "scanner.c"
+#line 3210 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3202 "scanner.c"
+#line 3216 "scanner.c"
 	}
 }
 
@@ -3217,17 +3231,17 @@ void value_take_notify (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 3221 "scanner.c"
+#line 3235 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3225 "scanner.c"
+#line 3239 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3231 "scanner.c"
+#line 3245 "scanner.c"
 	}
 }
 
@@ -3236,17 +3250,17 @@ static void notify_class_init (NotifyClass * klass) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_parent_class = g_type_class_peek_parent (klass);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_finalize;
+	((NotifyClass *) klass)->finalize = notify_finalize;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_real_run;
-#line 3243 "scanner.c"
+	((NotifyClass *) klass)->run = notify_real_run;
+#line 3257 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 3250 "scanner.c"
+#line 3264 "scanner.c"
 }
 
 
@@ -3254,7 +3268,9 @@ static void notify_finalize (Notify* obj) {
 	Notify * self;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
-#line 3258 "scanner.c"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
+#line 3274 "scanner.c"
 }
 
 
@@ -3279,7 +3295,7 @@ gpointer notify_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 3283 "scanner.c"
+#line 3299 "scanner.c"
 }
 
 
@@ -3292,7 +3308,7 @@ void notify_unref (gpointer instance) {
 		NOTIFY_GET_CLASS (self)->finalize (self);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3296 "scanner.c"
+#line 3312 "scanner.c"
 	}
 }
 
@@ -3308,7 +3324,7 @@ static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
-#line 3312 "scanner.c"
+#line 3328 "scanner.c"
 }
 
 
@@ -3318,14 +3334,14 @@ NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	self = (NotifyScanningChanged*) notify_construct (object_type);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3322 "scanner.c"
+#line 3338 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
-#line 3329 "scanner.c"
+#line 3345 "scanner.c"
 }
 
 
@@ -3333,8 +3349,8 @@ static void notify_scanning_changed_class_init (NotifyScanningChangedClass * kla
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scanning_changed_parent_class = g_type_class_peek_parent (klass);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_scanning_changed_real_run;
-#line 3338 "scanner.c"
+	((NotifyClass *) klass)->run = notify_scanning_changed_real_run;
+#line 3354 "scanner.c"
 }
 
 
@@ -3357,7 +3373,7 @@ GType notify_scanning_changed_get_type (void) {
 static void _scan_device_unref0_ (gpointer var) {
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 3361 "scanner.c"
+#line 3377 "scanner.c"
 }
 
 
@@ -3366,7 +3382,7 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 3370 "scanner.c"
+#line 3386 "scanner.c"
 }
 
 
@@ -3387,14 +3403,14 @@ NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList*
 	__g_list_free__scan_device_unref0_0 (devices);
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3391 "scanner.c"
+#line 3407 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
-#line 3398 "scanner.c"
+#line 3414 "scanner.c"
 }
 
 
@@ -3412,7 +3428,7 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	_tmp1_ = self->priv->devices;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
-#line 3416 "scanner.c"
+#line 3432 "scanner.c"
 }
 
 
@@ -3420,19 +3436,19 @@ static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass)
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_update_devices_parent_class = g_type_class_peek_parent (klass);
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_update_devices_finalize;
+	((NotifyClass *) klass)->finalize = notify_update_devices_finalize;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyUpdateDevicesPrivate));
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_update_devices_real_run;
-#line 3429 "scanner.c"
+	((NotifyClass *) klass)->run = notify_update_devices_real_run;
+#line 3445 "scanner.c"
 }
 
 
 static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
-#line 3436 "scanner.c"
+#line 3452 "scanner.c"
 }
 
 
@@ -3444,7 +3460,7 @@ static void notify_update_devices_finalize (Notify* obj) {
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
-#line 3448 "scanner.c"
+#line 3464 "scanner.c"
 }
 
 
@@ -3478,14 +3494,14 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	self->priv->resource = _tmp1_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3482 "scanner.c"
+#line 3498 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
-#line 3489 "scanner.c"
+#line 3505 "scanner.c"
 }
 
 
@@ -3503,7 +3519,7 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	_tmp1_ = self->priv->resource;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
-#line 3507 "scanner.c"
+#line 3523 "scanner.c"
 }
 
 
@@ -3511,19 +3527,19 @@ static void notify_request_authorization_class_init (NotifyRequestAuthorizationC
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_request_authorization_parent_class = g_type_class_peek_parent (klass);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_request_authorization_finalize;
+	((NotifyClass *) klass)->finalize = notify_request_authorization_finalize;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyRequestAuthorizationPrivate));
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_request_authorization_real_run;
-#line 3520 "scanner.c"
+	((NotifyClass *) klass)->run = notify_request_authorization_real_run;
+#line 3536 "scanner.c"
 }
 
 
 static void notify_request_authorization_instance_init (NotifyRequestAuthorization * self) {
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
-#line 3527 "scanner.c"
+#line 3543 "scanner.c"
 }
 
 
@@ -3535,7 +3551,7 @@ static void notify_request_authorization_finalize (Notify* obj) {
 	_g_free0 (self->priv->resource);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
-#line 3539 "scanner.c"
+#line 3555 "scanner.c"
 }
 
 
@@ -3574,14 +3590,14 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	self->priv->error_string = _tmp2_;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3578 "scanner.c"
+#line 3594 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scan_failed_construct (TYPE_NOTIFY_SCAN_FAILED, error_code, error_string);
-#line 3585 "scanner.c"
+#line 3601 "scanner.c"
 }
 
 
@@ -3602,7 +3618,7 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	_tmp2_ = self->priv->error_string;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
-#line 3606 "scanner.c"
+#line 3622 "scanner.c"
 }
 
 
@@ -3610,19 +3626,19 @@ static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scan_failed_parent_class = g_type_class_peek_parent (klass);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_scan_failed_finalize;
+	((NotifyClass *) klass)->finalize = notify_scan_failed_finalize;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyScanFailedPrivate));
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_scan_failed_real_run;
-#line 3619 "scanner.c"
+	((NotifyClass *) klass)->run = notify_scan_failed_real_run;
+#line 3635 "scanner.c"
 }
 
 
 static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
-#line 3626 "scanner.c"
+#line 3642 "scanner.c"
 }
 
 
@@ -3634,7 +3650,7 @@ static void notify_scan_failed_finalize (Notify* obj) {
 	_g_free0 (self->priv->error_string);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
-#line 3638 "scanner.c"
+#line 3654 "scanner.c"
 }
 
 
@@ -3661,7 +3677,7 @@ static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
-#line 3665 "scanner.c"
+#line 3681 "scanner.c"
 }
 
 
@@ -3671,14 +3687,14 @@ NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	self = (NotifyDocumentDone*) notify_construct (object_type);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3675 "scanner.c"
+#line 3691 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
-#line 3682 "scanner.c"
+#line 3698 "scanner.c"
 }
 
 
@@ -3686,8 +3702,8 @@ static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_document_done_parent_class = g_type_class_peek_parent (klass);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_document_done_real_run;
-#line 3691 "scanner.c"
+	((NotifyClass *) klass)->run = notify_document_done_real_run;
+#line 3707 "scanner.c"
 }
 
 
@@ -3718,7 +3734,7 @@ static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
-#line 3722 "scanner.c"
+#line 3738 "scanner.c"
 }
 
 
@@ -3728,14 +3744,14 @@ NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	self = (NotifyExpectPage*) notify_construct (object_type);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3732 "scanner.c"
+#line 3748 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
-#line 3739 "scanner.c"
+#line 3755 "scanner.c"
 }
 
 
@@ -3743,8 +3759,8 @@ static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_expect_page_parent_class = g_type_class_peek_parent (klass);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_expect_page_real_run;
-#line 3748 "scanner.c"
+	((NotifyClass *) klass)->run = notify_expect_page_real_run;
+#line 3764 "scanner.c"
 }
 
 
@@ -3767,7 +3783,7 @@ GType notify_expect_page_get_type (void) {
 static gpointer _scan_page_info_ref0 (gpointer self) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
-#line 3771 "scanner.c"
+#line 3787 "scanner.c"
 }
 
 
@@ -3794,14 +3810,14 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	self->priv->info = _tmp2_;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3798 "scanner.c"
+#line 3814 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_page_info_construct (TYPE_NOTIFY_GOT_PAGE_INFO, job_id, info);
-#line 3805 "scanner.c"
+#line 3821 "scanner.c"
 }
 
 
@@ -3823,7 +3839,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3827 "scanner.c"
+#line 3843 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3835,15 +3851,15 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3839 "scanner.c"
+#line 3855 "scanner.c"
 	} else {
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3843 "scanner.c"
+#line 3859 "scanner.c"
 	}
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 3847 "scanner.c"
+#line 3863 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanPageInfo* _tmp8_ = NULL;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3852,7 +3868,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp8_ = self->priv->info;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
-#line 3856 "scanner.c"
+#line 3872 "scanner.c"
 	}
 }
 
@@ -3861,19 +3877,19 @@ static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_page_info_parent_class = g_type_class_peek_parent (klass);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_got_page_info_finalize;
+	((NotifyClass *) klass)->finalize = notify_got_page_info_finalize;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_got_page_info_real_run;
-#line 3870 "scanner.c"
+	((NotifyClass *) klass)->run = notify_got_page_info_real_run;
+#line 3886 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
-#line 3877 "scanner.c"
+#line 3893 "scanner.c"
 }
 
 
@@ -3885,7 +3901,7 @@ static void notify_got_page_info_finalize (Notify* obj) {
 	_scan_page_info_unref0 (self->priv->info);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
-#line 3889 "scanner.c"
+#line 3905 "scanner.c"
 }
 
 
@@ -3912,14 +3928,14 @@ NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	self->priv->job_id = _tmp0_;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3916 "scanner.c"
+#line 3932 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
-#line 3923 "scanner.c"
+#line 3939 "scanner.c"
 }
 
 
@@ -3941,7 +3957,7 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3945 "scanner.c"
+#line 3961 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3953,21 +3969,21 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3957 "scanner.c"
+#line 3973 "scanner.c"
 	} else {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3961 "scanner.c"
+#line 3977 "scanner.c"
 	}
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 3965 "scanner.c"
+#line 3981 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "page-done");
-#line 3971 "scanner.c"
+#line 3987 "scanner.c"
 	}
 }
 
@@ -3976,19 +3992,19 @@ static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_page_done_parent_class = g_type_class_peek_parent (klass);
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_page_done_finalize;
+	((NotifyClass *) klass)->finalize = notify_page_done_finalize;
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_page_done_real_run;
-#line 3985 "scanner.c"
+	((NotifyClass *) klass)->run = notify_page_done_real_run;
+#line 4001 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
-#line 3992 "scanner.c"
+#line 4008 "scanner.c"
 }
 
 
@@ -3998,7 +4014,7 @@ static void notify_page_done_finalize (Notify* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
-#line 4002 "scanner.c"
+#line 4018 "scanner.c"
 }
 
 
@@ -4017,7 +4033,7 @@ GType notify_page_done_get_type (void) {
 static gpointer _scan_line_ref0 (gpointer self) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
-#line 4021 "scanner.c"
+#line 4037 "scanner.c"
 }
 
 
@@ -4044,14 +4060,14 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	self->priv->line = _tmp2_;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4048 "scanner.c"
+#line 4064 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
-#line 4055 "scanner.c"
+#line 4071 "scanner.c"
 }
 
 
@@ -4073,7 +4089,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 4077 "scanner.c"
+#line 4093 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -4085,15 +4101,15 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 4089 "scanner.c"
+#line 4105 "scanner.c"
 	} else {
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 4093 "scanner.c"
+#line 4109 "scanner.c"
 	}
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 4097 "scanner.c"
+#line 4113 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanLine* _tmp8_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4102,7 +4118,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp8_ = self->priv->line;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
-#line 4106 "scanner.c"
+#line 4122 "scanner.c"
 	}
 }
 
@@ -4111,19 +4127,19 @@ static void notify_got_line_class_init (NotifyGotLineClass * klass) {
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_line_parent_class = g_type_class_peek_parent (klass);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_got_line_finalize;
+	((NotifyClass *) klass)->finalize = notify_got_line_finalize;
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_got_line_real_run;
-#line 4120 "scanner.c"
+	((NotifyClass *) klass)->run = notify_got_line_real_run;
+#line 4136 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
-#line 4127 "scanner.c"
+#line 4143 "scanner.c"
 }
 
 
@@ -4135,7 +4151,7 @@ static void notify_got_line_finalize (Notify* obj) {
 	_scan_line_unref0 (self->priv->line);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
-#line 4139 "scanner.c"
+#line 4155 "scanner.c"
 }
 
 
@@ -4154,7 +4170,7 @@ GType notify_got_line_get_type (void) {
 static void _scan_job_unref0_ (gpointer var) {
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
-#line 4158 "scanner.c"
+#line 4174 "scanner.c"
 }
 
 
@@ -4163,28 +4179,28 @@ static void _g_list_free__scan_job_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 4167 "scanner.c"
+#line 4183 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
-#line 4174 "scanner.c"
+#line 4190 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
-#line 4181 "scanner.c"
+#line 4197 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
-#line 4188 "scanner.c"
+#line 4204 "scanner.c"
 }
 
 
@@ -4215,21 +4231,21 @@ static Scanner* scanner_construct (GType object_type) {
 	self->priv->authorize_queue = _tmp2_;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4219 "scanner.c"
+#line 4235 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
-#line 4226 "scanner.c"
+#line 4242 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
-#line 4233 "scanner.c"
+#line 4249 "scanner.c"
 }
 
 
@@ -4242,7 +4258,7 @@ Scanner* scanner_get_instance (void) {
 	_tmp0_ = scanner_scanner_object;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
-#line 4246 "scanner.c"
+#line 4262 "scanner.c"
 		Scanner* _tmp1_ = NULL;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
@@ -4250,7 +4266,7 @@ Scanner* scanner_get_instance (void) {
 		_scanner_unref0 (scanner_scanner_object);
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
-#line 4254 "scanner.c"
+#line 4270 "scanner.c"
 	}
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
@@ -4260,7 +4276,7 @@ Scanner* scanner_get_instance (void) {
 	result = _tmp3_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4264 "scanner.c"
+#line 4280 "scanner.c"
 }
 
 
@@ -4285,14 +4301,14 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	_notify_unref0 (notification);
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4289 "scanner.c"
+#line 4305 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
-#line 4296 "scanner.c"
+#line 4312 "scanner.c"
 }
 
 
@@ -4301,7 +4317,7 @@ static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	result = scanner_notify_idle_cb ((Scanner*) self);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4305 "scanner.c"
+#line 4321 "scanner.c"
 }
 
 
@@ -4323,7 +4339,7 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	g_async_queue_push (_tmp0_, _tmp2_);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
-#line 4327 "scanner.c"
+#line 4343 "scanner.c"
 }
 
 
@@ -4337,23 +4353,23 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	_tmp2_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
-#line 4341 "scanner.c"
+#line 4357 "scanner.c"
 		gboolean _tmp3_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
-#line 4347 "scanner.c"
+#line 4363 "scanner.c"
 	} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
-#line 4351 "scanner.c"
+#line 4367 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
-#line 4357 "scanner.c"
+#line 4373 "scanner.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
@@ -4361,25 +4377,25 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		_tmp5_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp5_) {
-#line 4365 "scanner.c"
+#line 4381 "scanner.c"
 			gboolean _tmp6_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_;
-#line 4371 "scanner.c"
+#line 4387 "scanner.c"
 		} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 4375 "scanner.c"
+#line 4391 "scanner.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_;
-#line 4379 "scanner.c"
+#line 4395 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 4383 "scanner.c"
+#line 4399 "scanner.c"
 		gboolean _tmp7_ = FALSE;
 		NotifyScanningChanged* _tmp8_ = NULL;
 		NotifyScanningChanged* _tmp9_ = NULL;
@@ -4395,7 +4411,7 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		scanner_notify (self, (Notify*) _tmp9_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp9_);
-#line 4399 "scanner.c"
+#line 4415 "scanner.c"
 	}
 }
 
@@ -4404,19 +4420,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1274 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1274 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 4420 "scanner.c"
+#line 4436 "scanner.c"
 }
 
 
@@ -4438,7 +4454,7 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 2;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4442 "scanner.c"
+#line 4458 "scanner.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
@@ -4450,13 +4466,13 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 0;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4454 "scanner.c"
+#line 4470 "scanner.c"
 	}
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4460 "scanner.c"
+#line 4476 "scanner.c"
 }
 
 
@@ -4504,7 +4520,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	_tmp7_ = weight2;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
-#line 4508 "scanner.c"
+#line 4524 "scanner.c"
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4515,7 +4531,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 		result = _tmp8_ - _tmp9_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4519 "scanner.c"
+#line 4535 "scanner.c"
 	}
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
@@ -4533,7 +4549,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	result = _tmp15_;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4537 "scanner.c"
+#line 4553 "scanner.c"
 }
 
 
@@ -4546,7 +4562,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 	switch (_tmp0_) {
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
-#line 4550 "scanner.c"
+#line 4566 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4555,11 +4571,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp1_;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4559 "scanner.c"
+#line 4575 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
-#line 4563 "scanner.c"
+#line 4579 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4568,11 +4584,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp2_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4572 "scanner.c"
+#line 4588 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
-#line 4576 "scanner.c"
+#line 4592 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4581,11 +4597,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp3_;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4585 "scanner.c"
+#line 4601 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
-#line 4589 "scanner.c"
+#line 4605 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4594,11 +4610,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp4_;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4598 "scanner.c"
+#line 4614 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
-#line 4602 "scanner.c"
+#line 4618 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4607,11 +4623,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp5_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4611 "scanner.c"
+#line 4627 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
-#line 4615 "scanner.c"
+#line 4631 "scanner.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4620,11 +4636,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp6_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4624 "scanner.c"
+#line 4640 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
-#line 4628 "scanner.c"
+#line 4644 "scanner.c"
 		{
 			gchar* _tmp7_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4633,11 +4649,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp7_;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4637 "scanner.c"
+#line 4653 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
-#line 4641 "scanner.c"
+#line 4657 "scanner.c"
 		{
 			gchar* _tmp8_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4646,11 +4662,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp8_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4650 "scanner.c"
+#line 4666 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
-#line 4654 "scanner.c"
+#line 4670 "scanner.c"
 		{
 			gchar* _tmp9_ = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4659,11 +4675,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp9_;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4663 "scanner.c"
+#line 4679 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
-#line 4667 "scanner.c"
+#line 4683 "scanner.c"
 		{
 			gchar* _tmp10_ = NULL;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4672,11 +4688,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp10_;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4676 "scanner.c"
+#line 4692 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
-#line 4680 "scanner.c"
+#line 4696 "scanner.c"
 		{
 			gchar* _tmp11_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4685,11 +4701,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp11_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4689 "scanner.c"
+#line 4705 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
-#line 4693 "scanner.c"
+#line 4709 "scanner.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4698,7 +4714,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp12_;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4702 "scanner.c"
+#line 4718 "scanner.c"
 		}
 		default:
 		{
@@ -4712,7 +4728,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp14_;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4716 "scanner.c"
+#line 4732 "scanner.c"
 		}
 	}
 }
@@ -4721,13 +4737,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4731 "scanner.c"
+#line 4747 "scanner.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4740,100 +4756,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
-		if (_inner_error_ != NULL) {
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4762 "scanner.c"
+#line 4778 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4771 "scanner.c"
+#line 4787 "scanner.c"
 		}
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
-		if (_inner_error_ != NULL) {
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4787 "scanner.c"
+#line 4803 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4798 "scanner.c"
+#line 4814 "scanner.c"
 		}
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
-#line 4812 "scanner.c"
+#line 4828 "scanner.c"
 	}
 	goto __finally14;
 	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1283 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1287 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4826 "scanner.c"
+#line 4842 "scanner.c"
 	}
 	__finally14:
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
-	if (_inner_error_ != NULL) {
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4837 "scanner.c"
+#line 4853 "scanner.c"
 	}
 }
 
@@ -4841,7 +4857,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 4845 "scanner.c"
+#line 4861 "scanner.c"
 }
 
 
@@ -4850,7 +4866,7 @@ static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpoint
 	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4854 "scanner.c"
+#line 4870 "scanner.c"
 }
 
 
@@ -4902,7 +4918,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp5_ = status;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 4906 "scanner.c"
+#line 4922 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4917,23 +4933,23 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->state = SCAN_STATE_IDLE;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 4921 "scanner.c"
+#line 4937 "scanner.c"
 	}
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 4925 "scanner.c"
+#line 4941 "scanner.c"
 	{
 		gint i = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 4930 "scanner.c"
+#line 4946 "scanner.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 4937 "scanner.c"
+#line 4953 "scanner.c"
 				SANE_Device** _tmp10_ = NULL;
 				gint _tmp10__length1 = 0;
 				gint _tmp11_ = 0;
@@ -4991,13 +5007,13 @@ static void scanner_do_redetect (Scanner* self) {
 				ScanDevice* _tmp55_ = NULL;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
-#line 4995 "scanner.c"
+#line 5011 "scanner.c"
 					gint _tmp9_ = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
-#line 5001 "scanner.c"
+#line 5017 "scanner.c"
 				}
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
@@ -5013,7 +5029,7 @@ static void scanner_do_redetect (Scanner* self) {
 				if (!(_tmp12_ != NULL)) {
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 5017 "scanner.c"
+#line 5033 "scanner.c"
 				}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = device_list;
@@ -5098,7 +5114,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_tmp41_ = vendor;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
-#line 5101 "scanner.c"
+#line 5117 "scanner.c"
 					gchar* _tmp42_ = NULL;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp42_ = g_strdup ("HP");
@@ -5106,7 +5122,7 @@ static void scanner_do_redetect (Scanner* self) {
 					_g_free0 (vendor);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp42_;
-#line 5109 "scanner.c"
+#line 5125 "scanner.c"
 				}
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_ = scan_device;
@@ -5148,7 +5164,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_g_free0 (vendor);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
-#line 5151 "scanner.c"
+#line 5167 "scanner.c"
 			}
 		}
 	}
@@ -5162,7 +5178,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp56_ = devices;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp56_ != NULL) {
-#line 5165 "scanner.c"
+#line 5181 "scanner.c"
 		ScanDevice* device = NULL;
 		GList* _tmp57_ = NULL;
 		gconstpointer _tmp58_ = NULL;
@@ -5190,13 +5206,13 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->default_device = _tmp62_;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
-#line 5193 "scanner.c"
+#line 5209 "scanner.c"
 	} else {
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
-#line 5199 "scanner.c"
+#line 5215 "scanner.c"
 	}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = devices;
@@ -5212,7 +5228,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_notify_unref0 (_tmp65_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 5215 "scanner.c"
+#line 5231 "scanner.c"
 }
 
 
@@ -5248,7 +5264,7 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	_tmp6_ = _tmp5_->constraint_type;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
-#line 5251 "scanner.c"
+#line 5267 "scanner.c"
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Range* _tmp8_ = NULL;
 		SANE_Word _tmp9_ = {0};
@@ -5269,15 +5285,15 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		_tmp12_ = _tmp11_->min;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
-#line 5272 "scanner.c"
+#line 5288 "scanner.c"
 	} else {
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
-#line 5276 "scanner.c"
+#line 5292 "scanner.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_) {
-#line 5280 "scanner.c"
+#line 5296 "scanner.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
@@ -5367,13 +5383,13 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
 " %d, max: %d]", _tmp29_, _tmp30_, _tmp31_, _tmp32_, (gint) _tmp35_, (gint) _tmp38_);
-#line 5369 "scanner.c"
+#line 5385 "scanner.c"
 	}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5375 "scanner.c"
+#line 5391 "scanner.c"
 }
 
 
@@ -5405,7 +5421,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		result = FALSE;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 5407 "scanner.c"
+#line 5423 "scanner.c"
 	}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -5431,7 +5447,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	_tmp9_ = status;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
-#line 5433 "scanner.c"
+#line 5449 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		SANE_Status _tmp12_ = 0;
@@ -5446,7 +5462,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		_tmp13_ = sane_strstatus (_tmp12_);
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
-#line 5448 "scanner.c"
+#line 5464 "scanner.c"
 	}
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
@@ -5454,7 +5470,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	result = _tmp14_ == SANE_STATUS_GOOD;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5456 "scanner.c"
+#line 5472 "scanner.c"
 }
 
 
@@ -5509,11 +5525,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp8_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
-#line 5511 "scanner.c"
+#line 5527 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
-#line 5515 "scanner.c"
+#line 5531 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
@@ -5521,11 +5537,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp10_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
-#line 5523 "scanner.c"
+#line 5539 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
-#line 5527 "scanner.c"
+#line 5543 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
@@ -5544,7 +5560,7 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_result_) {
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5545 "scanner.c"
+#line 5561 "scanner.c"
 	}
 }
 
@@ -5558,15 +5574,15 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	SANE_Option_Descriptor* _tmp3_ = NULL;
 	SANE_Constraint_Type _tmp4_ = 0;
 	SANE_Status status = 0;
-	SANE_Handle _tmp48_ = {0};
-	SANE_Int _tmp49_ = {0};
-	SANE_Status _tmp50_ = 0;
-	SANE_Int _tmp51_ = {0};
-	gint _tmp52_ = 0;
+	SANE_Handle _tmp47_ = {0};
+	SANE_Int _tmp48_ = {0};
+	SANE_Status _tmp49_ = 0;
+	SANE_Int _tmp50_ = {0};
+	gint _tmp51_ = 0;
+	gchar* _tmp52_ = NULL;
 	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	SANE_Int _tmp54_ = {0};
 	SANE_Int _tmp55_ = {0};
-	SANE_Int _tmp56_ = {0};
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5587,7 +5603,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	_tmp4_ = _tmp3_->constraint_type;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5588 "scanner.c"
+#line 5604 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
 		SANE_Word _tmp7_ = {0};
@@ -5607,7 +5623,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp7_ = _tmp6_->quant;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
-#line 5608 "scanner.c"
+#line 5624 "scanner.c"
 			SANE_Int _tmp8_ = {0};
 			SANE_Option_Descriptor* _tmp9_ = NULL;
 			SANE_Range* _tmp10_ = NULL;
@@ -5622,7 +5638,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp11_ = _tmp10_->quant;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
-#line 5623 "scanner.c"
+#line 5639 "scanner.c"
 		}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
@@ -5634,7 +5650,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp15_ = _tmp14_->min;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
-#line 5635 "scanner.c"
+#line 5651 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_ = NULL;
 			SANE_Range* _tmp17_ = NULL;
 			SANE_Word _tmp18_ = {0};
@@ -5646,7 +5662,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp18_ = _tmp17_->min;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
-#line 5647 "scanner.c"
+#line 5663 "scanner.c"
 		}
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
@@ -5658,7 +5674,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp22_ = _tmp21_->max;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
-#line 5659 "scanner.c"
+#line 5675 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_ = NULL;
 			SANE_Range* _tmp24_ = NULL;
 			SANE_Word _tmp25_ = {0};
@@ -5670,7 +5686,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp25_ = _tmp24_->max;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
-#line 5671 "scanner.c"
+#line 5687 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_ = NULL;
@@ -5681,161 +5697,158 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp27_ = _tmp26_->constraint_type;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5682 "scanner.c"
+#line 5698 "scanner.c"
 			gint distance = 0;
-			gint _tmp28_ = 0;
 			gint nearest = 0;
-			gint _tmp47_ = 0;
+			gint _tmp46_ = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp28_ = G_MAXINT;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			distance = _tmp28_;
+			distance = G_MAXINT;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
-#line 5693 "scanner.c"
+#line 5706 "scanner.c"
 			{
 				gint i = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5698 "scanner.c"
+#line 5711 "scanner.c"
 				{
-					gboolean _tmp29_ = FALSE;
+					gboolean _tmp28_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp29_ = TRUE;
+					_tmp28_ = TRUE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5705 "scanner.c"
-						gint _tmp31_ = 0;
-						SANE_Option_Descriptor* _tmp32_ = NULL;
-						SANE_Word* _tmp33_ = NULL;
-						gint _tmp33__length1 = 0;
-						SANE_Word _tmp34_ = {0};
+#line 5718 "scanner.c"
+						gint _tmp30_ = 0;
+						SANE_Option_Descriptor* _tmp31_ = NULL;
+						SANE_Word* _tmp32_ = NULL;
+						gint _tmp32__length1 = 0;
+						SANE_Word _tmp33_ = {0};
 						gint x = 0;
-						SANE_Option_Descriptor* _tmp35_ = NULL;
-						SANE_Word* _tmp36_ = NULL;
-						gint _tmp36__length1 = 0;
-						gint _tmp37_ = 0;
-						SANE_Word _tmp38_ = {0};
+						SANE_Option_Descriptor* _tmp34_ = NULL;
+						SANE_Word* _tmp35_ = NULL;
+						gint _tmp35__length1 = 0;
+						gint _tmp36_ = 0;
+						SANE_Word _tmp37_ = {0};
 						gint d = 0;
-						gint _tmp39_ = 0;
-						SANE_Int _tmp40_ = {0};
+						gint _tmp38_ = 0;
+						SANE_Int _tmp39_ = {0};
+						gint _tmp40_ = 0;
 						gint _tmp41_ = 0;
 						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
-						gint _tmp44_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp29_) {
-#line 5726 "scanner.c"
-							gint _tmp30_ = 0;
+						if (!_tmp28_) {
+#line 5739 "scanner.c"
+							gint _tmp29_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp30_ = i;
+							_tmp29_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp30_ + 1;
-#line 5732 "scanner.c"
+							i = _tmp29_ + 1;
+#line 5745 "scanner.c"
 						}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29_ = FALSE;
+						_tmp28_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = i;
+						_tmp30_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = option;
+						_tmp31_ = option;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = _tmp32_->constraint.word_list;
+						_tmp32_ = _tmp31_->constraint.word_list;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33__length1 = -1;
+						_tmp32__length1 = -1;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = _tmp33_[0];
+						_tmp33_ = _tmp32_[0];
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp31_) < _tmp34_)) {
+						if (!(((SANE_Word) _tmp30_) < _tmp33_)) {
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 5750 "scanner.c"
+#line 5763 "scanner.c"
 						}
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = option;
+						_tmp34_ = option;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = _tmp35_->constraint.word_list;
+						_tmp35_ = _tmp34_->constraint.word_list;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36__length1 = -1;
+						_tmp35__length1 = -1;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp37_ = i;
+						_tmp36_ = i;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp38_ = _tmp36_[_tmp37_ + 1];
+						_tmp37_ = _tmp35_[_tmp36_ + 1];
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = (gint) _tmp38_;
+						x = (gint) _tmp37_;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp39_ = x;
+						_tmp38_ = x;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp40_ = v;
+						_tmp39_ = v;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = (gint) (_tmp39_ - _tmp40_);
+						d = (gint) (_tmp38_ - _tmp39_);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp41_ = d;
+						_tmp40_ = d;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp42_ = abs (_tmp41_);
+						_tmp41_ = abs (_tmp40_);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = _tmp42_;
+						d = _tmp41_;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp43_ = d;
+						_tmp42_ = d;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp44_ = distance;
+						_tmp43_ = distance;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp43_ < _tmp44_) {
-#line 5782 "scanner.c"
+						if (_tmp42_ < _tmp43_) {
+#line 5795 "scanner.c"
+							gint _tmp44_ = 0;
 							gint _tmp45_ = 0;
-							gint _tmp46_ = 0;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp45_ = d;
+							_tmp44_ = d;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp45_;
+							distance = _tmp44_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp46_ = x;
+							_tmp45_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp46_;
-#line 5793 "scanner.c"
+							nearest = _tmp45_;
+#line 5806 "scanner.c"
 						}
 					}
 				}
 			}
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp47_ = nearest;
+			_tmp46_ = nearest;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = (SANE_Int) _tmp47_;
-#line 5802 "scanner.c"
+			v = (SANE_Int) _tmp46_;
+#line 5815 "scanner.c"
 		}
 	}
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = handle;
+	_tmp47_ = handle;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = option_index;
+	_tmp48_ = option_index;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = sane_control_option (_tmp48_, _tmp49_, SANE_ACTION_SET_VALUE, &v, NULL);
+	_tmp49_ = sane_control_option (_tmp47_, _tmp48_, SANE_ACTION_SET_VALUE, &v, NULL);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp50_;
+	status = _tmp49_;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = option_index;
+	_tmp50_ = option_index;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = value;
+	_tmp51_ = value;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = sane_status_to_string (status);
+	_tmp52_ = sane_status_to_string (status);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = _tmp53_;
+	_tmp53_ = _tmp52_;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = v;
+	_tmp54_ = v;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:462: sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) " \
-"-> (%s, %d)", (gint) _tmp51_, _tmp52_, _tmp54_, (gint) _tmp55_);
+"-> (%s, %d)", (gint) _tmp50_, _tmp51_, _tmp53_, (gint) _tmp54_);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp54_);
+	_g_free0 (_tmp53_);
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_ = v;
+	_tmp55_ = v;
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = (gint) _tmp56_;
+	_vala_result = (gint) _tmp55_;
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5835 "scanner.c"
+#line 5848 "scanner.c"
 	}
 }
 
@@ -5849,18 +5862,18 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	SANE_Value_Type _tmp2_ = 0;
 	SANE_Option_Descriptor* _tmp3_ = NULL;
 	SANE_Constraint_Type _tmp4_ = 0;
-	gdouble _tmp42_ = 0.0;
-	SANE_Fixed _tmp43_ = {0};
+	gdouble _tmp41_ = 0.0;
+	SANE_Fixed _tmp42_ = {0};
 	SANE_Status status = 0;
-	SANE_Handle _tmp44_ = {0};
-	SANE_Int _tmp45_ = {0};
-	SANE_Status _tmp46_ = 0;
-	SANE_Int _tmp47_ = {0};
-	gdouble _tmp48_ = 0.0;
+	SANE_Handle _tmp43_ = {0};
+	SANE_Int _tmp44_ = {0};
+	SANE_Status _tmp45_ = 0;
+	SANE_Int _tmp46_ = {0};
+	gdouble _tmp47_ = 0.0;
+	gchar* _tmp48_ = NULL;
 	gchar* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
+	gdouble _tmp50_ = 0.0;
 	gdouble _tmp51_ = 0.0;
-	gdouble _tmp52_ = 0.0;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5881,7 +5894,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	_tmp4_ = _tmp3_->constraint_type;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5881 "scanner.c"
+#line 5894 "scanner.c"
 		gdouble min = 0.0;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
@@ -5922,13 +5935,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp14_ = min;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
-#line 5922 "scanner.c"
+#line 5935 "scanner.c"
 			gdouble _tmp15_ = 0.0;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
-#line 5928 "scanner.c"
+#line 5941 "scanner.c"
 		}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
@@ -5936,13 +5949,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp17_ = max;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
-#line 5936 "scanner.c"
+#line 5949 "scanner.c"
 			gdouble _tmp18_ = 0.0;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
-#line 5942 "scanner.c"
+#line 5955 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_ = NULL;
@@ -5953,165 +5966,162 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp20_ = _tmp19_->constraint_type;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5953 "scanner.c"
+#line 5966 "scanner.c"
 			gdouble distance = 0.0;
-			gdouble _tmp21_ = 0.0;
 			gdouble nearest = 0.0;
-			gdouble _tmp41_ = 0.0;
+			gdouble _tmp40_ = 0.0;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = DBL_MAX;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			distance = _tmp21_;
+			distance = DBL_MAX;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
-#line 5964 "scanner.c"
+#line 5974 "scanner.c"
 			{
 				gint i = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5969 "scanner.c"
+#line 5979 "scanner.c"
 				{
-					gboolean _tmp22_ = FALSE;
+					gboolean _tmp21_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp22_ = TRUE;
+					_tmp21_ = TRUE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5976 "scanner.c"
-						gint _tmp24_ = 0;
-						SANE_Option_Descriptor* _tmp25_ = NULL;
-						SANE_Word* _tmp26_ = NULL;
-						gint _tmp26__length1 = 0;
-						SANE_Word _tmp27_ = {0};
+#line 5986 "scanner.c"
+						gint _tmp23_ = 0;
+						SANE_Option_Descriptor* _tmp24_ = NULL;
+						SANE_Word* _tmp25_ = NULL;
+						gint _tmp25__length1 = 0;
+						SANE_Word _tmp26_ = {0};
 						gdouble x = 0.0;
-						SANE_Option_Descriptor* _tmp28_ = NULL;
-						SANE_Word* _tmp29_ = NULL;
-						gint _tmp29__length1 = 0;
-						gint _tmp30_ = 0;
-						SANE_Word _tmp31_ = {0};
+						SANE_Option_Descriptor* _tmp27_ = NULL;
+						SANE_Word* _tmp28_ = NULL;
+						gint _tmp28__length1 = 0;
+						gint _tmp29_ = 0;
+						SANE_Word _tmp30_ = {0};
+						gdouble _tmp31_ = 0.0;
 						gdouble _tmp32_ = 0.0;
 						gdouble _tmp33_ = 0.0;
 						gdouble _tmp34_ = 0.0;
 						gdouble _tmp35_ = 0.0;
-						gdouble _tmp36_ = 0.0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp22_) {
-#line 5995 "scanner.c"
-							gint _tmp23_ = 0;
+						if (!_tmp21_) {
+#line 6005 "scanner.c"
+							gint _tmp22_ = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp23_ = i;
+							_tmp22_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp23_ + 1;
-#line 6001 "scanner.c"
+							i = _tmp22_ + 1;
+#line 6011 "scanner.c"
 						}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp22_ = FALSE;
+						_tmp21_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp24_ = i;
+						_tmp23_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp25_ = option;
+						_tmp24_ = option;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp26_ = _tmp25_->constraint.word_list;
+						_tmp25_ = _tmp24_->constraint.word_list;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp26__length1 = -1;
+						_tmp25__length1 = -1;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp27_ = _tmp26_[0];
+						_tmp26_ = _tmp25_[0];
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp24_) < _tmp27_)) {
+						if (!(((SANE_Word) _tmp23_) < _tmp26_)) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6019 "scanner.c"
+#line 6029 "scanner.c"
 						}
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp28_ = option;
+						_tmp27_ = option;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29_ = _tmp28_->constraint.word_list;
+						_tmp28_ = _tmp27_->constraint.word_list;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29__length1 = -1;
+						_tmp28__length1 = -1;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30_ = i;
+						_tmp29_ = i;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = _tmp29_[_tmp30_ + 1];
+						_tmp30_ = _tmp28_[_tmp29_ + 1];
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = SANE_UNFIX ((SANE_Fixed) _tmp31_);
+						_tmp31_ = SANE_UNFIX ((SANE_Fixed) _tmp30_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = _tmp32_;
+						x = _tmp31_;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = x;
+						_tmp32_ = x;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = v;
+						_tmp33_ = v;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = fabs (_tmp33_ - _tmp34_);
+						_tmp34_ = fabs (_tmp32_ - _tmp33_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = distance;
+						_tmp35_ = distance;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp35_ < _tmp36_) {
-#line 6045 "scanner.c"
+						if (_tmp34_ < _tmp35_) {
+#line 6055 "scanner.c"
+							gdouble _tmp36_ = 0.0;
 							gdouble _tmp37_ = 0.0;
 							gdouble _tmp38_ = 0.0;
 							gdouble _tmp39_ = 0.0;
-							gdouble _tmp40_ = 0.0;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp37_ = x;
+							_tmp36_ = x;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp38_ = v;
+							_tmp37_ = v;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp39_ = fabs (_tmp37_ - _tmp38_);
+							_tmp38_ = fabs (_tmp36_ - _tmp37_);
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp39_;
+							distance = _tmp38_;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp40_ = x;
+							_tmp39_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp40_;
-#line 6062 "scanner.c"
+							nearest = _tmp39_;
+#line 6072 "scanner.c"
 						}
 					}
 				}
 			}
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp41_ = nearest;
+			_tmp40_ = nearest;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = _tmp41_;
-#line 6071 "scanner.c"
+			v = _tmp40_;
+#line 6081 "scanner.c"
 		}
 	}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = v;
+	_tmp41_ = v;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = SANE_FIX (_tmp42_);
+	_tmp42_ = SANE_FIX (_tmp41_);
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	v_fixed = _tmp43_;
+	v_fixed = _tmp42_;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = handle;
+	_tmp43_ = handle;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = option_index;
+	_tmp44_ = option_index;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_ = sane_control_option (_tmp44_, _tmp45_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
+	_tmp45_ = sane_control_option (_tmp43_, _tmp44_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp46_;
+	status = _tmp45_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = option_index;
+	_tmp46_ = option_index;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = value;
+	_tmp47_ = value;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = sane_status_to_string (status);
+	_tmp48_ = sane_status_to_string (status);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = _tmp49_;
+	_tmp49_ = _tmp48_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = SANE_UNFIX (v_fixed);
+	_tmp50_ = SANE_UNFIX (v_fixed);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:502: sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) " \
-"-> (%s, %f)", (gint) _tmp47_, _tmp48_, _tmp50_, _tmp51_);
+"-> (%s, %f)", (gint) _tmp46_, _tmp47_, _tmp49_, _tmp50_);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp50_);
+	_g_free0 (_tmp49_);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = SANE_UNFIX (v_fixed);
+	_tmp51_ = SANE_UNFIX (v_fixed);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp52_;
+	_vala_result = _tmp51_;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6110 "scanner.c"
+#line 6120 "scanner.c"
 	}
 }
 
@@ -6130,7 +6140,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 	_tmp1_ = _tmp0_->type;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_TYPE_FIXED) {
-#line 6129 "scanner.c"
+#line 6139 "scanner.c"
 		SANE_Handle _tmp2_ = {0};
 		SANE_Option_Descriptor* _tmp3_ = NULL;
 		SANE_Int _tmp4_ = {0};
@@ -6148,7 +6158,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_vala_result = _tmp6_;
-#line 6147 "scanner.c"
+#line 6157 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Value_Type _tmp8_ = 0;
@@ -6158,7 +6168,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		_tmp8_ = _tmp7_->type;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_ == SANE_TYPE_INT) {
-#line 6157 "scanner.c"
+#line 6167 "scanner.c"
 			gint r = 0;
 			SANE_Handle _tmp9_ = {0};
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6185,20 +6195,20 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 			_tmp15_ = r;
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = (gdouble) _tmp15_;
-#line 6184 "scanner.c"
+#line 6194 "scanner.c"
 		} else {
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = 0.0;
 #line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:520: Unable to set unsupported option type");
-#line 6190 "scanner.c"
+#line 6200 "scanner.c"
 		}
 	}
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6197 "scanner.c"
+#line 6207 "scanner.c"
 	}
 }
 
@@ -6228,7 +6238,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 6227 "scanner.c"
+#line 6237 "scanner.c"
 	}
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -6255,7 +6265,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 "on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp10_);
-#line 6253 "scanner.c"
+#line 6263 "scanner.c"
 }
 
 
@@ -6263,17 +6273,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 996 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 6271 "scanner.c"
+#line 6281 "scanner.c"
 }
 
 
@@ -6340,14 +6350,14 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	_s_size_ = s_length1;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
-#line 6338 "scanner.c"
+#line 6348 "scanner.c"
 	{
 		gboolean _tmp6_ = FALSE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
-#line 6345 "scanner.c"
+#line 6355 "scanner.c"
 			gboolean _tmp8_ = FALSE;
 			gint _tmp9_ = 0;
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6361,13 +6371,13 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			gchar _tmp20_ = '\0';
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp6_) {
-#line 6359 "scanner.c"
+#line 6369 "scanner.c"
 				gint _tmp7_ = 0;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp7_ + 1;
-#line 6365 "scanner.c"
+#line 6375 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
@@ -6379,7 +6389,7 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			_tmp11_ = _tmp10_->size;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
-#line 6377 "scanner.c"
+#line 6387 "scanner.c"
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
@@ -6391,17 +6401,17 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp14_ != '\0';
-#line 6389 "scanner.c"
+#line 6399 "scanner.c"
 			} else {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
-#line 6393 "scanner.c"
+#line 6403 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp8_) {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 6399 "scanner.c"
+#line 6409 "scanner.c"
 			}
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = s;
@@ -6419,7 +6429,7 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			_tmp15_[_tmp16_] = _tmp19_;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _tmp15_[_tmp16_];
-#line 6417 "scanner.c"
+#line 6427 "scanner.c"
 		}
 	}
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6477,15 +6487,15 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	if (_result_) {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6474 "scanner.c"
+#line 6484 "scanner.c"
 	} else {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6478 "scanner.c"
+#line 6488 "scanner.c"
 	}
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6482 "scanner.c"
+#line 6492 "scanner.c"
 }
 
 
@@ -6513,19 +6523,19 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	_tmp3_ = _tmp2_->constraint_type;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6510 "scanner.c"
+#line 6520 "scanner.c"
 	{
 		gint i = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 6515 "scanner.c"
+#line 6525 "scanner.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 6522 "scanner.c"
+#line 6532 "scanner.c"
 				gchar** _tmp6_ = NULL;
 				gint _tmp6__length1 = 0;
 				gint _tmp7_ = 0;
@@ -6538,13 +6548,13 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				const gchar* _tmp25_ = NULL;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp4_) {
-#line 6535 "scanner.c"
+#line 6545 "scanner.c"
 					gint _tmp5_ = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp5_ = i;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp5_ + 1;
-#line 6541 "scanner.c"
+#line 6551 "scanner.c"
 				}
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
@@ -6560,18 +6570,18 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				if (!(_tmp8_ != NULL)) {
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 6557 "scanner.c"
+#line 6567 "scanner.c"
 				}
 #line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
-#line 6561 "scanner.c"
+#line 6571 "scanner.c"
 				{
 					gboolean _tmp9_ = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = TRUE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6568 "scanner.c"
+#line 6578 "scanner.c"
 						SANE_Option_Descriptor* _tmp11_ = NULL;
 						gchar** _tmp12_ = NULL;
 						gint _tmp12__length1 = 0;
@@ -6588,13 +6598,13 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						const gchar* _tmp21_ = NULL;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp9_) {
-#line 6585 "scanner.c"
+#line 6595 "scanner.c"
 							gint _tmp10_ = 0;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp10_ = j;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp10_ + 1;
-#line 6591 "scanner.c"
+#line 6601 "scanner.c"
 						}
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp9_ = FALSE;
@@ -6612,7 +6622,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						if (!(_tmp14_ != NULL)) {
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6609 "scanner.c"
+#line 6619 "scanner.c"
 						}
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = values;
@@ -6636,7 +6646,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6633 "scanner.c"
+#line 6643 "scanner.c"
 						}
 					}
 				}
@@ -6652,7 +6662,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				_tmp25_ = _tmp23_[_tmp24_];
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp25_ != NULL) {
-#line 6649 "scanner.c"
+#line 6659 "scanner.c"
 					SANE_Handle _tmp26_ = {0};
 					SANE_Option_Descriptor* _tmp27_ = NULL;
 					SANE_Int _tmp28_ = {0};
@@ -6688,15 +6698,15 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 					if (_result_) {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
-#line 6685 "scanner.c"
+#line 6695 "scanner.c"
 					} else {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
-#line 6689 "scanner.c"
+#line 6699 "scanner.c"
 					}
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 6693 "scanner.c"
+#line 6703 "scanner.c"
 				}
 			}
 		}
@@ -6713,15 +6723,15 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	if (_result_) {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6710 "scanner.c"
+#line 6720 "scanner.c"
 	} else {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6714 "scanner.c"
+#line 6724 "scanner.c"
 	}
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6718 "scanner.c"
+#line 6728 "scanner.c"
 }
 
 
@@ -6768,7 +6778,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp3_ = _tmp2_->name;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6765 "scanner.c"
+#line 6775 "scanner.c"
 		const gchar* _tmp4_ = NULL;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -6793,7 +6803,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp9_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
-#line 6790 "scanner.c"
+#line 6800 "scanner.c"
 	}
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
@@ -6801,7 +6811,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp11_ = _tmp10_->title;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6798 "scanner.c"
+#line 6808 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -6826,7 +6836,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp17_;
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
-#line 6823 "scanner.c"
+#line 6833 "scanner.c"
 	}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
@@ -6836,7 +6846,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp19_) {
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
-#line 6833 "scanner.c"
+#line 6843 "scanner.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -6850,11 +6860,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp21_;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6847 "scanner.c"
+#line 6857 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
-#line 6851 "scanner.c"
+#line 6861 "scanner.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
@@ -6868,11 +6878,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp23_;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6865 "scanner.c"
+#line 6875 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
-#line 6869 "scanner.c"
+#line 6879 "scanner.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
@@ -6886,11 +6896,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp25_;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6883 "scanner.c"
+#line 6893 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
-#line 6887 "scanner.c"
+#line 6897 "scanner.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gchar* _tmp27_ = NULL;
@@ -6904,11 +6914,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp27_;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6901 "scanner.c"
+#line 6911 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
-#line 6905 "scanner.c"
+#line 6915 "scanner.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
@@ -6922,11 +6932,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp29_;
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6919 "scanner.c"
+#line 6929 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
-#line 6923 "scanner.c"
+#line 6933 "scanner.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
@@ -6940,7 +6950,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp31_;
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6937 "scanner.c"
+#line 6947 "scanner.c"
 		}
 		default:
 		{
@@ -6970,7 +6980,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp36_);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6967 "scanner.c"
+#line 6977 "scanner.c"
 		}
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6999,15 +7009,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp45_) {
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
-#line 6996 "scanner.c"
+#line 7006 "scanner.c"
 		{
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7000 "scanner.c"
+#line 7010 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
-#line 7004 "scanner.c"
+#line 7014 "scanner.c"
 		{
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
@@ -7021,11 +7031,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp47_;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7018 "scanner.c"
+#line 7028 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
-#line 7022 "scanner.c"
+#line 7032 "scanner.c"
 		{
 			const gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -7039,11 +7049,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp49_;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7036 "scanner.c"
+#line 7046 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
-#line 7040 "scanner.c"
+#line 7050 "scanner.c"
 		{
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
@@ -7057,11 +7067,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp51_;
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7054 "scanner.c"
+#line 7064 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
-#line 7058 "scanner.c"
+#line 7068 "scanner.c"
 		{
 			const gchar* _tmp52_ = NULL;
 			gchar* _tmp53_ = NULL;
@@ -7075,11 +7085,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp53_;
 #line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7072 "scanner.c"
+#line 7082 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
-#line 7076 "scanner.c"
+#line 7086 "scanner.c"
 		{
 			const gchar* _tmp54_ = NULL;
 			gchar* _tmp55_ = NULL;
@@ -7093,11 +7103,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp55_;
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7090 "scanner.c"
+#line 7100 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
-#line 7094 "scanner.c"
+#line 7104 "scanner.c"
 		{
 			const gchar* _tmp56_ = NULL;
 			gchar* _tmp57_ = NULL;
@@ -7111,7 +7121,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp57_;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7108 "scanner.c"
+#line 7118 "scanner.c"
 		}
 		default:
 		{
@@ -7141,7 +7151,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp62_);
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7138 "scanner.c"
+#line 7148 "scanner.c"
 		}
 	}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7152,7 +7162,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp65_) {
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
-#line 7149 "scanner.c"
+#line 7159 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_ = NULL;
 			SANE_Value_Type _tmp67_ = 0;
@@ -7162,7 +7172,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp67_ = _tmp66_->type;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7159 "scanner.c"
+#line 7169 "scanner.c"
 				const gchar* _tmp68_ = NULL;
 				SANE_Option_Descriptor* _tmp69_ = NULL;
 				SANE_Range* _tmp70_ = NULL;
@@ -7214,7 +7224,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp82_;
 #line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
-#line 7211 "scanner.c"
+#line 7221 "scanner.c"
 			} else {
 				const gchar* _tmp83_ = NULL;
 				SANE_Option_Descriptor* _tmp84_ = NULL;
@@ -7261,15 +7271,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp95_;
 #line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
-#line 7258 "scanner.c"
+#line 7268 "scanner.c"
 			}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7262 "scanner.c"
+#line 7272 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
-#line 7266 "scanner.c"
+#line 7276 "scanner.c"
 		{
 			const gchar* _tmp96_ = NULL;
 			gchar* _tmp97_ = NULL;
@@ -7283,19 +7293,19 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
-#line 7280 "scanner.c"
+#line 7290 "scanner.c"
 			{
 				gint i = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7285 "scanner.c"
+#line 7295 "scanner.c"
 				{
 					gboolean _tmp98_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7292 "scanner.c"
+#line 7302 "scanner.c"
 						gint _tmp100_ = 0;
 						SANE_Option_Descriptor* _tmp101_ = NULL;
 						SANE_Word* _tmp102_ = NULL;
@@ -7306,13 +7316,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						SANE_Value_Type _tmp108_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp98_) {
-#line 7303 "scanner.c"
+#line 7313 "scanner.c"
 							gint _tmp99_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp99_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp99_ + 1;
-#line 7309 "scanner.c"
+#line 7319 "scanner.c"
 						}
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
@@ -7330,13 +7340,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7327 "scanner.c"
+#line 7337 "scanner.c"
 						}
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = i;
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp104_ != 0) {
-#line 7333 "scanner.c"
+#line 7343 "scanner.c"
 							const gchar* _tmp105_ = NULL;
 							gchar* _tmp106_ = NULL;
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7347,7 +7357,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							_g_free0 (s);
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp106_;
-#line 7344 "scanner.c"
+#line 7354 "scanner.c"
 						}
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp107_ = option;
@@ -7355,7 +7365,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						_tmp108_ = _tmp107_->type;
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp108_ == SANE_TYPE_INT) {
-#line 7352 "scanner.c"
+#line 7362 "scanner.c"
 							const gchar* _tmp109_ = NULL;
 							SANE_Option_Descriptor* _tmp110_ = NULL;
 							SANE_Word* _tmp111_ = NULL;
@@ -7389,7 +7399,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							s = _tmp116_;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp115_);
-#line 7386 "scanner.c"
+#line 7396 "scanner.c"
 						} else {
 							const gchar* _tmp117_ = NULL;
 							SANE_Option_Descriptor* _tmp118_ = NULL;
@@ -7427,7 +7437,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							s = _tmp125_;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp124_);
-#line 7424 "scanner.c"
+#line 7434 "scanner.c"
 						}
 					}
 				}
@@ -7442,11 +7452,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp127_;
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7439 "scanner.c"
+#line 7449 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
-#line 7443 "scanner.c"
+#line 7453 "scanner.c"
 		{
 			const gchar* _tmp128_ = NULL;
 			gchar* _tmp129_ = NULL;
@@ -7460,19 +7470,19 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp129_;
-#line 7457 "scanner.c"
+#line 7467 "scanner.c"
 			{
 				gint i = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7462 "scanner.c"
+#line 7472 "scanner.c"
 				{
 					gboolean _tmp130_ = FALSE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp130_ = TRUE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7469 "scanner.c"
+#line 7479 "scanner.c"
 						SANE_Option_Descriptor* _tmp132_ = NULL;
 						gchar** _tmp133_ = NULL;
 						gint _tmp133__length1 = 0;
@@ -7490,13 +7500,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gchar* _tmp146_ = NULL;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp130_) {
-#line 7487 "scanner.c"
+#line 7497 "scanner.c"
 							gint _tmp131_ = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp131_ = i;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp131_ + 1;
-#line 7493 "scanner.c"
+#line 7503 "scanner.c"
 						}
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp130_ = FALSE;
@@ -7514,13 +7524,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						if (!(_tmp135_ != NULL)) {
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7511 "scanner.c"
+#line 7521 "scanner.c"
 						}
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp136_ != 0) {
-#line 7517 "scanner.c"
+#line 7527 "scanner.c"
 							const gchar* _tmp137_ = NULL;
 							gchar* _tmp138_ = NULL;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7531,7 +7541,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							_g_free0 (s);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp138_;
-#line 7528 "scanner.c"
+#line 7538 "scanner.c"
 						}
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp139_ = s;
@@ -7557,7 +7567,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						s = _tmp146_;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp145_);
-#line 7554 "scanner.c"
+#line 7564 "scanner.c"
 					}
 				}
 			}
@@ -7571,13 +7581,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp148_;
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7568 "scanner.c"
+#line 7578 "scanner.c"
 		}
 		default:
 		{
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7574 "scanner.c"
+#line 7584 "scanner.c"
 		}
 	}
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7590,7 +7600,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp151_ = cap;
 #line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp151_ != ((SANE_Int) 0)) {
-#line 7587 "scanner.c"
+#line 7597 "scanner.c"
 		const gchar* _tmp152_ = NULL;
 		gchar* _tmp153_ = NULL;
 		SANE_Int _tmp154_ = {0};
@@ -7613,7 +7623,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		_tmp154_ = cap;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7610 "scanner.c"
+#line 7620 "scanner.c"
 			const gchar* _tmp155_ = NULL;
 			const gchar* _tmp158_ = NULL;
 			gchar* _tmp159_ = NULL;
@@ -7622,7 +7632,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp155_ = s;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp155_, "") != 0) {
-#line 7619 "scanner.c"
+#line 7629 "scanner.c"
 				const gchar* _tmp156_ = NULL;
 				gchar* _tmp157_ = NULL;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7633,7 +7643,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp157_;
-#line 7630 "scanner.c"
+#line 7640 "scanner.c"
 			}
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = s;
@@ -7647,13 +7657,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp160_ = cap;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
-#line 7644 "scanner.c"
+#line 7654 "scanner.c"
 		}
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = cap;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7650 "scanner.c"
+#line 7660 "scanner.c"
 			const gchar* _tmp162_ = NULL;
 			const gchar* _tmp165_ = NULL;
 			gchar* _tmp166_ = NULL;
@@ -7662,7 +7672,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp162_ = s;
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp162_, "") != 0) {
-#line 7659 "scanner.c"
+#line 7669 "scanner.c"
 				const gchar* _tmp163_ = NULL;
 				gchar* _tmp164_ = NULL;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7673,7 +7683,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp164_;
-#line 7670 "scanner.c"
+#line 7680 "scanner.c"
 			}
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp165_ = s;
@@ -7687,13 +7697,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp167_ = cap;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
-#line 7684 "scanner.c"
+#line 7694 "scanner.c"
 		}
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp168_ = cap;
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7690 "scanner.c"
+#line 7700 "scanner.c"
 			const gchar* _tmp169_ = NULL;
 			const gchar* _tmp172_ = NULL;
 			gchar* _tmp173_ = NULL;
@@ -7702,7 +7712,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp169_ = s;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp169_, "") != 0) {
-#line 7699 "scanner.c"
+#line 7709 "scanner.c"
 				const gchar* _tmp170_ = NULL;
 				gchar* _tmp171_ = NULL;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7713,7 +7723,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp171_;
-#line 7710 "scanner.c"
+#line 7720 "scanner.c"
 			}
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = s;
@@ -7727,13 +7737,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp174_ = cap;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
-#line 7724 "scanner.c"
+#line 7734 "scanner.c"
 		}
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = cap;
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7730 "scanner.c"
+#line 7740 "scanner.c"
 			const gchar* _tmp176_ = NULL;
 			const gchar* _tmp179_ = NULL;
 			gchar* _tmp180_ = NULL;
@@ -7742,7 +7752,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp176_ = s;
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp176_, "") != 0) {
-#line 7739 "scanner.c"
+#line 7749 "scanner.c"
 				const gchar* _tmp177_ = NULL;
 				gchar* _tmp178_ = NULL;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7753,7 +7763,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp178_;
-#line 7750 "scanner.c"
+#line 7760 "scanner.c"
 			}
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = s;
@@ -7767,13 +7777,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp181_ = cap;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp181_ & (~SANE_CAP_EMULATED);
-#line 7764 "scanner.c"
+#line 7774 "scanner.c"
 		}
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp182_ = cap;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7770 "scanner.c"
+#line 7780 "scanner.c"
 			const gchar* _tmp183_ = NULL;
 			const gchar* _tmp186_ = NULL;
 			gchar* _tmp187_ = NULL;
@@ -7782,7 +7792,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp183_ = s;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp183_, "") != 0) {
-#line 7779 "scanner.c"
+#line 7789 "scanner.c"
 				const gchar* _tmp184_ = NULL;
 				gchar* _tmp185_ = NULL;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7793,7 +7803,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp185_;
-#line 7790 "scanner.c"
+#line 7800 "scanner.c"
 			}
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = s;
@@ -7807,13 +7817,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp188_ = cap;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
-#line 7804 "scanner.c"
+#line 7814 "scanner.c"
 		}
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp189_ = cap;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7810 "scanner.c"
+#line 7820 "scanner.c"
 			const gchar* _tmp190_ = NULL;
 			const gchar* _tmp193_ = NULL;
 			gchar* _tmp194_ = NULL;
@@ -7822,7 +7832,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp190_ = s;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp190_, "") != 0) {
-#line 7819 "scanner.c"
+#line 7829 "scanner.c"
 				const gchar* _tmp191_ = NULL;
 				gchar* _tmp192_ = NULL;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7833,7 +7843,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp192_;
-#line 7830 "scanner.c"
+#line 7840 "scanner.c"
 			}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = s;
@@ -7847,13 +7857,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp195_ = cap;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
-#line 7844 "scanner.c"
+#line 7854 "scanner.c"
 		}
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp196_ = cap;
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7850 "scanner.c"
+#line 7860 "scanner.c"
 			const gchar* _tmp197_ = NULL;
 			const gchar* _tmp200_ = NULL;
 			gchar* _tmp201_ = NULL;
@@ -7862,7 +7872,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp197_ = s;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp197_, "") != 0) {
-#line 7859 "scanner.c"
+#line 7869 "scanner.c"
 				const gchar* _tmp198_ = NULL;
 				gchar* _tmp199_ = NULL;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7873,7 +7883,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp199_;
-#line 7870 "scanner.c"
+#line 7880 "scanner.c"
 			}
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = s;
@@ -7887,13 +7897,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp202_ = cap;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
-#line 7884 "scanner.c"
+#line 7894 "scanner.c"
 		}
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp203_ = cap;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp203_ != ((SANE_Int) 0)) {
-#line 7890 "scanner.c"
+#line 7900 "scanner.c"
 			const gchar* _tmp204_ = NULL;
 			const gchar* _tmp207_ = NULL;
 			SANE_Int _tmp208_ = {0};
@@ -7904,7 +7914,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp204_ = s;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp204_, "") != 0) {
-#line 7901 "scanner.c"
+#line 7911 "scanner.c"
 				const gchar* _tmp205_ = NULL;
 				gchar* _tmp206_ = NULL;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7915,7 +7925,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp206_;
-#line 7912 "scanner.c"
+#line 7922 "scanner.c"
 			}
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = s;
@@ -7933,7 +7943,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp211_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp210_);
-#line 7930 "scanner.c"
+#line 7940 "scanner.c"
 		}
 	}
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7946,7 +7956,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp214_ = _tmp213_->desc;
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp214_ != NULL) {
-#line 7943 "scanner.c"
+#line 7953 "scanner.c"
 		SANE_Option_Descriptor* _tmp215_ = NULL;
 		const gchar* _tmp216_ = NULL;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7955,11 +7965,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		_tmp216_ = _tmp215_->desc;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
-#line 7952 "scanner.c"
+#line 7962 "scanner.c"
 	}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 7956 "scanner.c"
+#line 7966 "scanner.c"
 }
 
 
@@ -7994,19 +8004,19 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	_tmp6_ = g_async_queue_pop (_tmp5_);
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 7991 "scanner.c"
+#line 8001 "scanner.c"
 	{
 		gint i = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 7996 "scanner.c"
+#line 8006 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8003 "scanner.c"
+#line 8013 "scanner.c"
 				gboolean _tmp9_ = FALSE;
 				Credentials* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
@@ -8022,13 +8032,13 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gchar _tmp22_ = '\0';
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp7_) {
-#line 8019 "scanner.c"
+#line 8029 "scanner.c"
 					gint _tmp8_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp8_ = i;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp8_ + 1;
-#line 8025 "scanner.c"
+#line 8035 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
@@ -8042,7 +8052,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp13_ != '\0') {
-#line 8039 "scanner.c"
+#line 8049 "scanner.c"
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8051,17 +8061,17 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 					_tmp15_ = SANE_MAX_USERNAME_LEN;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = _tmp14_ < _tmp15_;
-#line 8048 "scanner.c"
+#line 8058 "scanner.c"
 				} else {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = FALSE;
-#line 8052 "scanner.c"
+#line 8062 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8058 "scanner.c"
+#line 8068 "scanner.c"
 				}
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = username;
@@ -8081,7 +8091,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp16_[_tmp17_] = _tmp21_;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = _tmp16_[_tmp17_];
-#line 8078 "scanner.c"
+#line 8088 "scanner.c"
 			}
 		}
 	}
@@ -8089,14 +8099,14 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 		gint i = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8086 "scanner.c"
+#line 8096 "scanner.c"
 		{
 			gboolean _tmp23_ = FALSE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = TRUE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8093 "scanner.c"
+#line 8103 "scanner.c"
 				gboolean _tmp25_ = FALSE;
 				Credentials* _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
@@ -8112,13 +8122,13 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gchar _tmp38_ = '\0';
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp23_) {
-#line 8109 "scanner.c"
+#line 8119 "scanner.c"
 					gint _tmp24_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp24_ = i;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp24_ + 1;
-#line 8115 "scanner.c"
+#line 8125 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = FALSE;
@@ -8132,7 +8142,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp29_ != '\0') {
-#line 8129 "scanner.c"
+#line 8139 "scanner.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8141,17 +8151,17 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 					_tmp31_ = SANE_MAX_USERNAME_LEN;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = _tmp30_ < _tmp31_;
-#line 8138 "scanner.c"
+#line 8148 "scanner.c"
 				} else {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = FALSE;
-#line 8142 "scanner.c"
+#line 8152 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp25_) {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8148 "scanner.c"
+#line 8158 "scanner.c"
 				}
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = password;
@@ -8171,20 +8181,20 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp32_[_tmp33_] = _tmp37_;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp32_[_tmp33_];
-#line 8168 "scanner.c"
+#line 8178 "scanner.c"
 			}
 		}
 	}
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8174 "scanner.c"
+#line 8184 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8181 "scanner.c"
+#line 8191 "scanner.c"
 }
 
 
@@ -8231,7 +8241,7 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	g_async_queue_push (_tmp5_, _tmp6_);
 #line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8228 "scanner.c"
+#line 8238 "scanner.c"
 }
 
 
@@ -8243,7 +8253,7 @@ static void scanner_close_device (Scanner* self) {
 	_tmp0_ = self->priv->have_handle;
 #line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8240 "scanner.c"
+#line 8250 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8264,7 +8274,7 @@ static void scanner_close_device (Scanner* self) {
 		_g_hash_table_unref0 (self->priv->options);
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8261 "scanner.c"
+#line 8271 "scanner.c"
 	}
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
@@ -8280,7 +8290,7 @@ static void scanner_close_device (Scanner* self) {
 	self->priv->job_queue = NULL;
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8277 "scanner.c"
+#line 8287 "scanner.c"
 }
 
 
@@ -8309,21 +8319,21 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	scanner_notify (self, (Notify*) _tmp3_);
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8306 "scanner.c"
+#line 8316 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8313 "scanner.c"
+#line 8323 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8320 "scanner.c"
+#line 8330 "scanner.c"
 }
 
 
@@ -8338,29 +8348,29 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	_tmp1_ = self->priv->state;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8335 "scanner.c"
+#line 8345 "scanner.c"
 		gboolean _tmp2_ = FALSE;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8341 "scanner.c"
+#line 8351 "scanner.c"
 	} else {
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8345 "scanner.c"
+#line 8355 "scanner.c"
 	}
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8351 "scanner.c"
+#line 8361 "scanner.c"
 	}
 #line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8357 "scanner.c"
+#line 8367 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
@@ -8371,23 +8381,23 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		_tmp5_ = self->priv->state;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SCAN_STATE_IDLE) {
-#line 8368 "scanner.c"
+#line 8378 "scanner.c"
 			gint _tmp6_ = 0;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = request_count;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_ == 0;
-#line 8374 "scanner.c"
+#line 8384 "scanner.c"
 		} else {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 8378 "scanner.c"
+#line 8388 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp4_) {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = TRUE;
-#line 8384 "scanner.c"
+#line 8394 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
@@ -8397,11 +8407,11 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_tmp8_ = g_async_queue_length (_tmp7_);
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = _tmp8_ > 0;
-#line 8394 "scanner.c"
+#line 8404 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp3_) {
-#line 8398 "scanner.c"
+#line 8408 "scanner.c"
 			GAsyncQueue* _tmp9_ = NULL;
 			gpointer _tmp10_ = NULL;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8412,7 +8422,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp10_;
-#line 8409 "scanner.c"
+#line 8419 "scanner.c"
 		} else {
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
@@ -8420,7 +8430,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8417 "scanner.c"
+#line 8427 "scanner.c"
 		}
 #line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:802: Processing request");
@@ -8432,7 +8442,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		_tmp12_ = request;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
-#line 8429 "scanner.c"
+#line 8439 "scanner.c"
 			RequestStartScan* r = NULL;
 			Request* _tmp13_ = NULL;
 			RequestStartScan* _tmp14_ = NULL;
@@ -8455,7 +8465,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8452 "scanner.c"
+#line 8462 "scanner.c"
 		} else {
 			Request* _tmp18_ = NULL;
 #line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8464,7 +8474,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
 #line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
-#line 8461 "scanner.c"
+#line 8471 "scanner.c"
 			} else {
 				Request* _tmp19_ = NULL;
 #line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8479,13 +8489,13 @@ static gboolean scanner_handle_requests (Scanner* self) {
 					_request_unref0 (request);
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8476 "scanner.c"
+#line 8486 "scanner.c"
 				}
 			}
 		}
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8482 "scanner.c"
+#line 8492 "scanner.c"
 	}
 }
 
@@ -8493,7 +8503,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 static void _g_free0_ (gpointer var) {
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8490 "scanner.c"
+#line 8500 "scanner.c"
 }
 
 
@@ -8551,21 +8561,21 @@ static void scanner_do_open (Scanner* self) {
 	_tmp5_ = _tmp4_->device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8548 "scanner.c"
+#line 8558 "scanner.c"
 		const gchar* _tmp6_ = NULL;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8554 "scanner.c"
+#line 8564 "scanner.c"
 	} else {
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8558 "scanner.c"
+#line 8568 "scanner.c"
 	}
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 8562 "scanner.c"
+#line 8572 "scanner.c"
 		ScanJob* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -8579,7 +8589,7 @@ static void scanner_do_open (Scanner* self) {
 		_g_free0 (_tmp7_->device);
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_->device = _tmp9_;
-#line 8576 "scanner.c"
+#line 8586 "scanner.c"
 	}
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -8587,7 +8597,7 @@ static void scanner_do_open (Scanner* self) {
 	_tmp11_ = _tmp10_->device;
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ == NULL) {
-#line 8584 "scanner.c"
+#line 8594 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:837: No scan device available");
@@ -8599,13 +8609,13 @@ static void scanner_do_open (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8596 "scanner.c"
+#line 8606 "scanner.c"
 	}
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = self->priv->have_handle;
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
-#line 8602 "scanner.c"
+#line 8612 "scanner.c"
 		const gchar* _tmp14_ = NULL;
 		ScanJob* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
@@ -8624,7 +8634,7 @@ static void scanner_do_open (Scanner* self) {
 			_scan_job_unref0 (job);
 #line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8621 "scanner.c"
+#line 8631 "scanner.c"
 		}
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = self->priv->handle;
@@ -8634,7 +8644,7 @@ static void scanner_do_open (Scanner* self) {
 		g_debug ("scanner.vala:854: sane_close ()");
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8631 "scanner.c"
+#line 8641 "scanner.c"
 	}
 #line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
@@ -8680,7 +8690,7 @@ static void scanner_do_open (Scanner* self) {
 	_tmp30_ = status;
 #line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 8677 "scanner.c"
+#line 8687 "scanner.c"
 		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_ = 0;
@@ -8701,7 +8711,7 @@ static void scanner_do_open (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8698 "scanner.c"
+#line 8708 "scanner.c"
 	}
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
@@ -8719,7 +8729,7 @@ static void scanner_do_open (Scanner* self) {
 	self->priv->state = SCAN_STATE_GET_OPTION;
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8716 "scanner.c"
+#line 8726 "scanner.c"
 }
 
 
@@ -8784,7 +8794,7 @@ static void scanner_do_get_option (Scanner* self) {
 	_tmp9_ = option;
 #line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8781 "scanner.c"
+#line 8791 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -8860,7 +8870,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp14_ = option;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8857 "scanner.c"
+#line 8867 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
@@ -8875,13 +8885,13 @@ static void scanner_do_get_option (Scanner* self) {
 			index = (SANE_Int) _tmp16_;
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8871 "scanner.c"
+#line 8881 "scanner.c"
 		}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8877 "scanner.c"
+#line 8887 "scanner.c"
 			gchar** flatbed_sources = NULL;
 			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -9093,7 +9103,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp56_) {
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 9089 "scanner.c"
+#line 9099 "scanner.c"
 				{
 					SANE_Handle _tmp57_ = {0};
 					SANE_Option_Descriptor* _tmp58_ = NULL;
@@ -9109,7 +9119,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp60_) {
-#line 9105 "scanner.c"
+#line 9115 "scanner.c"
 						SANE_Handle _tmp61_ = {0};
 						SANE_Option_Descriptor* _tmp62_ = NULL;
 						SANE_Int _tmp63_ = {0};
@@ -9132,16 +9142,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp65_) {
 #line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:949: Unable to set single page source, please file a bug");
-#line 9128 "scanner.c"
+#line 9138 "scanner.c"
 						}
 					}
 #line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9133 "scanner.c"
+#line 9143 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9137 "scanner.c"
+#line 9147 "scanner.c"
 				{
 					SANE_Handle _tmp66_ = {0};
 					SANE_Option_Descriptor* _tmp67_ = NULL;
@@ -9163,7 +9173,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
 #line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp70_) {
-#line 9159 "scanner.c"
+#line 9169 "scanner.c"
 						SANE_Handle _tmp71_ = {0};
 						SANE_Option_Descriptor* _tmp72_ = NULL;
 						SANE_Int _tmp73_ = {0};
@@ -9186,16 +9196,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp75_) {
 #line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:954: Unable to set front ADF source, please file a bug");
-#line 9182 "scanner.c"
+#line 9192 "scanner.c"
 						}
 					}
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9187 "scanner.c"
+#line 9197 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9191 "scanner.c"
+#line 9201 "scanner.c"
 				{
 					SANE_Handle _tmp76_ = {0};
 					SANE_Option_Descriptor* _tmp77_ = NULL;
@@ -9217,7 +9227,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp80_) {
-#line 9213 "scanner.c"
+#line 9223 "scanner.c"
 						SANE_Handle _tmp81_ = {0};
 						SANE_Option_Descriptor* _tmp82_ = NULL;
 						SANE_Int _tmp83_ = {0};
@@ -9240,16 +9250,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp85_) {
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:959: Unable to set back ADF source, please file a bug");
-#line 9236 "scanner.c"
+#line 9246 "scanner.c"
 						}
 					}
 #line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9241 "scanner.c"
+#line 9251 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9245 "scanner.c"
+#line 9255 "scanner.c"
 				{
 					SANE_Handle _tmp86_ = {0};
 					SANE_Option_Descriptor* _tmp87_ = NULL;
@@ -9271,7 +9281,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
 #line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp90_) {
-#line 9267 "scanner.c"
+#line 9277 "scanner.c"
 						SANE_Handle _tmp91_ = {0};
 						SANE_Option_Descriptor* _tmp92_ = NULL;
 						SANE_Int _tmp93_ = {0};
@@ -9294,17 +9304,17 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp95_) {
 #line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:964: Unable to set duplex ADF source, please file a bug");
-#line 9290 "scanner.c"
+#line 9300 "scanner.c"
 						}
 					}
 #line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9295 "scanner.c"
+#line 9305 "scanner.c"
 				}
 				default:
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9300 "scanner.c"
+#line 9310 "scanner.c"
 			}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
@@ -9316,7 +9326,7 @@ static void scanner_do_get_option (Scanner* self) {
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9312 "scanner.c"
+#line 9322 "scanner.c"
 		}
 #line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = self->priv->handle;
@@ -9332,7 +9342,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp100_ = option;
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_ != NULL) {
-#line 9328 "scanner.c"
+#line 9338 "scanner.c"
 			gchar** color_scan_modes = NULL;
 			const gchar* _tmp101_ = NULL;
 			gchar* _tmp102_ = NULL;
@@ -9536,7 +9546,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp140_) {
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9532 "scanner.c"
+#line 9542 "scanner.c"
 				{
 					SANE_Handle _tmp141_ = {0};
 					SANE_Option_Descriptor* _tmp142_ = NULL;
@@ -9560,15 +9570,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp145_) {
 #line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1014: Unable to set Color mode, please file a bug");
-#line 9556 "scanner.c"
+#line 9566 "scanner.c"
 					}
 #line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9560 "scanner.c"
+#line 9570 "scanner.c"
 				}
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9564 "scanner.c"
+#line 9574 "scanner.c"
 				{
 					SANE_Handle _tmp146_ = {0};
 					SANE_Option_Descriptor* _tmp147_ = NULL;
@@ -9592,15 +9602,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp150_) {
 #line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1018: Unable to set Gray mode, please file a bug");
-#line 9588 "scanner.c"
+#line 9598 "scanner.c"
 					}
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9592 "scanner.c"
+#line 9602 "scanner.c"
 				}
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9596 "scanner.c"
+#line 9606 "scanner.c"
 				{
 					SANE_Handle _tmp151_ = {0};
 					SANE_Option_Descriptor* _tmp152_ = NULL;
@@ -9624,17 +9634,17 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp155_) {
 #line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1022: Unable to set Lineart mode, please file a bug");
-#line 9620 "scanner.c"
+#line 9630 "scanner.c"
 					}
 #line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9624 "scanner.c"
+#line 9634 "scanner.c"
 				}
 				default:
 				{
 #line 1025 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9630 "scanner.c"
+#line 9640 "scanner.c"
 				}
 			}
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9643,7 +9653,7 @@ static void scanner_do_get_option (Scanner* self) {
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 9639 "scanner.c"
+#line 9649 "scanner.c"
 		}
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = self->priv->handle;
@@ -9657,7 +9667,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp159_ = option;
 #line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp159_ != NULL) {
-#line 9653 "scanner.c"
+#line 9663 "scanner.c"
 			SANE_Option_Descriptor* _tmp160_ = NULL;
 			SANE_Value_Type _tmp161_ = 0;
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9666,7 +9676,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp161_ = _tmp160_->type;
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp161_ == SANE_TYPE_BOOL) {
-#line 9662 "scanner.c"
+#line 9672 "scanner.c"
 				SANE_Handle _tmp162_ = {0};
 				SANE_Option_Descriptor* _tmp163_ = NULL;
 				SANE_Int _tmp164_ = {0};
@@ -9684,7 +9694,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp166_ = _tmp165_->type;
 #line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp162_, _tmp163_, _tmp164_, _tmp166_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9680 "scanner.c"
+#line 9690 "scanner.c"
 			}
 		}
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9699,7 +9709,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp170_ = option;
 #line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp170_ != NULL) {
-#line 9695 "scanner.c"
+#line 9705 "scanner.c"
 			SANE_Option_Descriptor* _tmp171_ = NULL;
 			SANE_Value_Type _tmp172_ = 0;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9708,7 +9718,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp172_ = _tmp171_->type;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp172_ == SANE_TYPE_BOOL) {
-#line 9704 "scanner.c"
+#line 9714 "scanner.c"
 				SANE_Handle _tmp173_ = {0};
 				SANE_Option_Descriptor* _tmp174_ = NULL;
 				SANE_Int _tmp175_ = {0};
@@ -9726,7 +9736,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp177_ = _tmp176_->type;
 #line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp173_, _tmp174_, _tmp175_, _tmp177_ != SCAN_TYPE_SINGLE, NULL);
-#line 9722 "scanner.c"
+#line 9732 "scanner.c"
 			}
 		}
 #line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9741,7 +9751,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp181_ = option;
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp181_ != NULL) {
-#line 9737 "scanner.c"
+#line 9747 "scanner.c"
 			gchar** disable_compression_names = NULL;
 			const gchar* _tmp182_ = NULL;
 			gchar* _tmp183_ = NULL;
@@ -9802,11 +9812,11 @@ static void scanner_do_get_option (Scanner* self) {
 			if (!_tmp193_) {
 #line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_warning ("scanner.vala:1058: Unable to disable compression, please file a bug");
-#line 9798 "scanner.c"
+#line 9808 "scanner.c"
 			}
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
-#line 9802 "scanner.c"
+#line 9812 "scanner.c"
 		}
 #line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = self->priv->handle;
@@ -9822,7 +9832,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp198_ = option;
 #line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp198_ != NULL) {
-#line 9818 "scanner.c"
+#line 9828 "scanner.c"
 			SANE_Handle _tmp199_ = {0};
 			SANE_Option_Descriptor* _tmp200_ = NULL;
 			SANE_Int _tmp201_ = {0};
@@ -9865,7 +9875,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp210_ = option;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp210_ != NULL) {
-#line 9861 "scanner.c"
+#line 9871 "scanner.c"
 				ScanJob* _tmp211_ = NULL;
 				gint _tmp212_ = 0;
 #line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9874,7 +9884,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp212_ = _tmp211_->depth;
 #line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp212_ > 0) {
-#line 9870 "scanner.c"
+#line 9880 "scanner.c"
 					SANE_Handle _tmp213_ = {0};
 					SANE_Option_Descriptor* _tmp214_ = NULL;
 					SANE_Int _tmp215_ = {0};
@@ -9892,7 +9902,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp217_ = _tmp216_->depth;
 #line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
-#line 9888 "scanner.c"
+#line 9898 "scanner.c"
 				}
 			}
 		}
@@ -9910,7 +9920,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp222_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp222_ != NULL) {
-#line 9906 "scanner.c"
+#line 9916 "scanner.c"
 			ScanJob* _tmp223_ = NULL;
 			gint _tmp224_ = 0;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9919,7 +9929,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp224_ = _tmp223_->page_width;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp224_ > 0) {
-#line 9915 "scanner.c"
+#line 9925 "scanner.c"
 				SANE_Handle _tmp225_ = {0};
 				SANE_Option_Descriptor* _tmp226_ = NULL;
 				SANE_Int _tmp227_ = {0};
@@ -9949,7 +9959,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
 #line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
-#line 9945 "scanner.c"
+#line 9955 "scanner.c"
 			} else {
 				SANE_Handle _tmp234_ = {0};
 				SANE_Option_Descriptor* _tmp235_ = NULL;
@@ -9962,7 +9972,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp236_ = index;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
-#line 9958 "scanner.c"
+#line 9968 "scanner.c"
 			}
 		}
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9979,7 +9989,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp241_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp241_ != NULL) {
-#line 9975 "scanner.c"
+#line 9985 "scanner.c"
 			ScanJob* _tmp242_ = NULL;
 			gint _tmp243_ = 0;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9988,7 +9998,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp243_ = _tmp242_->page_height;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp243_ > 0) {
-#line 9984 "scanner.c"
+#line 9994 "scanner.c"
 				SANE_Handle _tmp244_ = {0};
 				SANE_Option_Descriptor* _tmp245_ = NULL;
 				SANE_Int _tmp246_ = {0};
@@ -10018,7 +10028,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
 #line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
-#line 10014 "scanner.c"
+#line 10024 "scanner.c"
 			} else {
 				SANE_Handle _tmp253_ = {0};
 				SANE_Option_Descriptor* _tmp254_ = NULL;
@@ -10031,7 +10041,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp255_ = index;
 #line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
-#line 10027 "scanner.c"
+#line 10037 "scanner.c"
 			}
 		}
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10048,7 +10058,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp261_ = option;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp261_ != NULL) {
-#line 10044 "scanner.c"
+#line 10054 "scanner.c"
 			ScanJob* _tmp262_ = NULL;
 			gint _tmp263_ = 0;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10057,15 +10067,15 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp263_ = _tmp262_->page_width;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
-#line 10053 "scanner.c"
+#line 10063 "scanner.c"
 		} else {
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = FALSE;
-#line 10057 "scanner.c"
+#line 10067 "scanner.c"
 		}
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp260_) {
-#line 10061 "scanner.c"
+#line 10071 "scanner.c"
 			SANE_Handle _tmp264_ = {0};
 			SANE_Option_Descriptor* _tmp265_ = NULL;
 			SANE_Int _tmp266_ = {0};
@@ -10095,7 +10105,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
-#line 10091 "scanner.c"
+#line 10101 "scanner.c"
 		}
 #line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp273_ = self->priv->handle;
@@ -10111,7 +10121,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp278_ = option;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp278_ != NULL) {
-#line 10107 "scanner.c"
+#line 10117 "scanner.c"
 			ScanJob* _tmp279_ = NULL;
 			gint _tmp280_ = 0;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10120,15 +10130,15 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp280_ = _tmp279_->page_height;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
-#line 10116 "scanner.c"
+#line 10126 "scanner.c"
 		} else {
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = FALSE;
-#line 10120 "scanner.c"
+#line 10130 "scanner.c"
 		}
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp277_) {
-#line 10124 "scanner.c"
+#line 10134 "scanner.c"
 			SANE_Handle _tmp281_ = {0};
 			SANE_Option_Descriptor* _tmp282_ = NULL;
 			SANE_Int _tmp283_ = {0};
@@ -10158,7 +10168,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
-#line 10154 "scanner.c"
+#line 10164 "scanner.c"
 		}
 #line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp290_ = self->priv->handle;
@@ -10174,7 +10184,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp294_ = option;
 #line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp294_ != NULL) {
-#line 10170 "scanner.c"
+#line 10180 "scanner.c"
 			ScanJob* _tmp295_ = NULL;
 			gint _tmp296_ = 0;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10183,7 +10193,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp296_ = _tmp295_->brightness;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp296_ != 0) {
-#line 10179 "scanner.c"
+#line 10189 "scanner.c"
 				gint brightness = 0;
 				SANE_Option_Descriptor* _tmp297_ = NULL;
 				ScanJob* _tmp298_ = NULL;
@@ -10213,7 +10223,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp304_ = brightness;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
-#line 10209 "scanner.c"
+#line 10219 "scanner.c"
 			}
 		}
 #line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10230,7 +10240,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp309_ = option;
 #line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp309_ != NULL) {
-#line 10226 "scanner.c"
+#line 10236 "scanner.c"
 			ScanJob* _tmp310_ = NULL;
 			gint _tmp311_ = 0;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10239,7 +10249,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp311_ = _tmp310_->contrast;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp311_ != 0) {
-#line 10235 "scanner.c"
+#line 10245 "scanner.c"
 				gint contrast = 0;
 				SANE_Option_Descriptor* _tmp312_ = NULL;
 				ScanJob* _tmp313_ = NULL;
@@ -10269,14 +10279,14 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp319_ = contrast;
 #line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
-#line 10265 "scanner.c"
+#line 10275 "scanner.c"
 			}
 		}
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp320_ = self->priv->current_device;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp320_, "test") == 0) {
-#line 10272 "scanner.c"
+#line 10282 "scanner.c"
 			SANE_Handle _tmp321_ = {0};
 			gint _tmp322_ = 0;
 			SANE_Option_Descriptor* _tmp323_ = NULL;
@@ -10309,7 +10319,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp324_ = option;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp324_ != NULL) {
-#line 10305 "scanner.c"
+#line 10315 "scanner.c"
 				SANE_Handle _tmp325_ = {0};
 				SANE_Option_Descriptor* _tmp326_ = NULL;
 				SANE_Int _tmp327_ = {0};
@@ -10321,7 +10331,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp327_ = index;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
-#line 10317 "scanner.c"
+#line 10327 "scanner.c"
 			}
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp328_ = self->priv->handle;
@@ -10335,7 +10345,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp331_ = option;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp331_ != NULL) {
-#line 10331 "scanner.c"
+#line 10341 "scanner.c"
 				SANE_Handle _tmp332_ = {0};
 				SANE_Option_Descriptor* _tmp333_ = NULL;
 				SANE_Int _tmp334_ = {0};
@@ -10347,7 +10357,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp334_ = index;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
-#line 10343 "scanner.c"
+#line 10353 "scanner.c"
 			}
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp335_ = self->priv->handle;
@@ -10361,7 +10371,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp338_ = option;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp338_ != NULL) {
-#line 10357 "scanner.c"
+#line 10367 "scanner.c"
 				SANE_Handle _tmp339_ = {0};
 				SANE_Option_Descriptor* _tmp340_ = NULL;
 				SANE_Int _tmp341_ = {0};
@@ -10373,7 +10383,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp341_ = index;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
-#line 10369 "scanner.c"
+#line 10379 "scanner.c"
 			}
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp342_ = self->priv->handle;
@@ -10387,7 +10397,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp345_ = option;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp345_ != NULL) {
-#line 10383 "scanner.c"
+#line 10393 "scanner.c"
 				SANE_Handle _tmp346_ = {0};
 				SANE_Option_Descriptor* _tmp347_ = NULL;
 				SANE_Int _tmp348_ = {0};
@@ -10399,7 +10409,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp348_ = index;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
-#line 10395 "scanner.c"
+#line 10405 "scanner.c"
 			}
 #line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp349_ = self->priv->handle;
@@ -10413,7 +10423,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp352_ = option;
 #line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp352_ != NULL) {
-#line 10409 "scanner.c"
+#line 10419 "scanner.c"
 				SANE_Handle _tmp353_ = {0};
 				SANE_Option_Descriptor* _tmp354_ = NULL;
 				SANE_Int _tmp355_ = {0};
@@ -10425,7 +10435,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp355_ = index;
 #line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
-#line 10421 "scanner.c"
+#line 10431 "scanner.c"
 			}
 		}
 #line 1139 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10434,7 +10444,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10430 "scanner.c"
+#line 10440 "scanner.c"
 	}
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp356_ = index;
@@ -10452,7 +10462,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10448 "scanner.c"
+#line 10458 "scanner.c"
 	}
 #line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp360_ = option;
@@ -10464,7 +10474,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10460 "scanner.c"
+#line 10470 "scanner.c"
 	}
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp362_ = option;
@@ -10476,7 +10486,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10472 "scanner.c"
+#line 10482 "scanner.c"
 	}
 #line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp364_ = self->priv->options;
@@ -10492,7 +10502,7 @@ static void scanner_do_get_option (Scanner* self) {
 	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
 #line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10488 "scanner.c"
+#line 10498 "scanner.c"
 }
 
 
@@ -10510,7 +10520,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	_tmp1_ = _tmp0_->unit;
 #line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
-#line 10506 "scanner.c"
+#line 10516 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
 #line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10521,7 +10531,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		result = (_tmp2_ * _tmp3_) / 254.0;
 #line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10517 "scanner.c"
+#line 10527 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
@@ -10531,7 +10541,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		_tmp5_ = _tmp4_->unit;
 #line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
-#line 10527 "scanner.c"
+#line 10537 "scanner.c"
 			gdouble _tmp6_ = 0.0;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
@@ -10539,7 +10549,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = _tmp6_ / 10.0;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10535 "scanner.c"
+#line 10545 "scanner.c"
 		} else {
 #line 1168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1168: Unable to set unsupported unit type");
@@ -10547,7 +10557,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = (gdouble) 0.0f;
 #line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10543 "scanner.c"
+#line 10553 "scanner.c"
 		}
 	}
 }
@@ -10585,11 +10595,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 		if (index) {
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10581 "scanner.c"
+#line 10591 "scanner.c"
 		}
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10585 "scanner.c"
+#line 10595 "scanner.c"
 	}
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
@@ -10603,11 +10613,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	if (index) {
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10599 "scanner.c"
+#line 10609 "scanner.c"
 	}
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10603 "scanner.c"
+#line 10613 "scanner.c"
 }
 
 
@@ -10639,7 +10649,7 @@ static void scanner_do_complete_document (Scanner* self) {
 		self->priv->state = SCAN_STATE_OPEN;
 #line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10635 "scanner.c"
+#line 10645 "scanner.c"
 	}
 #line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
@@ -10651,7 +10661,7 @@ static void scanner_do_complete_document (Scanner* self) {
 	_notify_unref0 (_tmp4_);
 #line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10647 "scanner.c"
+#line 10657 "scanner.c"
 }
 
 
@@ -10703,7 +10713,7 @@ static void scanner_do_start (Scanner* self) {
 	if (_tmp9_ == SANE_STATUS_GOOD) {
 #line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10699 "scanner.c"
+#line 10709 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
 #line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10712,7 +10722,7 @@ static void scanner_do_start (Scanner* self) {
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
 #line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10708 "scanner.c"
+#line 10718 "scanner.c"
 		} else {
 			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
@@ -10730,7 +10740,7 @@ static void scanner_do_start (Scanner* self) {
 			_tmp14_ = _ ("Unable to start scan");
 #line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10726 "scanner.c"
+#line 10736 "scanner.c"
 		}
 	}
 }
@@ -10745,7 +10755,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10741 "scanner.c"
+#line 10751 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10754,11 +10764,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10750 "scanner.c"
+#line 10760 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10754 "scanner.c"
+#line 10764 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10767,11 +10777,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10763 "scanner.c"
+#line 10773 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10767 "scanner.c"
+#line 10777 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10780,11 +10790,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10776 "scanner.c"
+#line 10786 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10780 "scanner.c"
+#line 10790 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10793,11 +10803,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10789 "scanner.c"
+#line 10799 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10793 "scanner.c"
+#line 10803 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10806,7 +10816,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10802 "scanner.c"
+#line 10812 "scanner.c"
 		}
 		default:
 		{
@@ -10820,7 +10830,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp7_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10816 "scanner.c"
+#line 10826 "scanner.c"
 		}
 	}
 }
@@ -10911,7 +10921,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp6_ = status;
 #line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10907 "scanner.c"
+#line 10917 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
@@ -10930,7 +10940,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
 #line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10926 "scanner.c"
+#line 10936 "scanner.c"
 	}
 #line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
@@ -10948,11 +10958,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp16_) {
 #line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 10944 "scanner.c"
+#line 10954 "scanner.c"
 	} else {
 #line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 10948 "scanner.c"
+#line 10958 "scanner.c"
 	}
 #line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
@@ -11017,7 +11027,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp43_ = _tmp42_.depth;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp43_ == 8) {
-#line 11012 "scanner.c"
+#line 11022 "scanner.c"
 		SANE_Parameters _tmp44_ = {0};
 		SANE_Frame _tmp45_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11026,15 +11036,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp45_ = _tmp44_.format;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
-#line 11021 "scanner.c"
+#line 11031 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
-#line 11025 "scanner.c"
+#line 11035 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp41_) {
-#line 11029 "scanner.c"
+#line 11039 "scanner.c"
 		ScanJob* _tmp46_ = NULL;
 		gint _tmp47_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11043,15 +11053,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp47_ = _tmp46_->depth;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp47_ == 2;
-#line 11038 "scanner.c"
+#line 11048 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
-#line 11042 "scanner.c"
+#line 11052 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_) {
-#line 11046 "scanner.c"
+#line 11056 "scanner.c"
 		ScanJob* _tmp48_ = NULL;
 		ScanMode _tmp49_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11060,15 +11070,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp49_ = _tmp48_->scan_mode;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
-#line 11055 "scanner.c"
+#line 11065 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = FALSE;
-#line 11059 "scanner.c"
+#line 11069 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
-#line 11063 "scanner.c"
+#line 11073 "scanner.c"
 		ScanPageInfo* _tmp50_ = NULL;
 		ScanJob* _tmp51_ = NULL;
 		gint _tmp52_ = 0;
@@ -11080,7 +11090,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp52_ = _tmp51_->depth;
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_->depth = _tmp52_;
-#line 11075 "scanner.c"
+#line 11085 "scanner.c"
 	}
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->parameters;
@@ -11090,11 +11100,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp55_ == SANE_FRAME_GRAY) {
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 1;
-#line 11085 "scanner.c"
+#line 11095 "scanner.c"
 	} else {
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 3;
-#line 11089 "scanner.c"
+#line 11099 "scanner.c"
 	}
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = info;
@@ -11124,7 +11134,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp64_ = self->priv->notified_page;
 #line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp63_ != _tmp64_) {
-#line 11119 "scanner.c"
+#line 11129 "scanner.c"
 		ScanJob* _tmp65_ = NULL;
 		gint _tmp66_ = 0;
 		ScanPageInfo* _tmp67_ = NULL;
@@ -11149,7 +11159,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp70_ = self->priv->page_number;
 #line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp70_;
-#line 11144 "scanner.c"
+#line 11154 "scanner.c"
 	}
 #line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp71_ = self->priv->parameters;
@@ -11181,7 +11191,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_scan_page_info_unref0 (info);
 #line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11176 "scanner.c"
+#line 11186 "scanner.c"
 }
 
 
@@ -11226,7 +11236,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp8_ = _tmp7_.last_frame;
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11221 "scanner.c"
+#line 11231 "scanner.c"
 		gint _tmp9_ = 0;
 #line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
@@ -11238,7 +11248,7 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11233 "scanner.c"
+#line 11243 "scanner.c"
 	}
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -11246,7 +11256,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp11_ = _tmp10_->type;
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11241 "scanner.c"
+#line 11251 "scanner.c"
 		gint _tmp12_ = 0;
 		ScanJob* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
@@ -11276,13 +11286,13 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11271 "scanner.c"
+#line 11281 "scanner.c"
 	}
 #line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
 #line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11277 "scanner.c"
+#line 11287 "scanner.c"
 }
 
 
@@ -11377,7 +11387,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp17_ = status;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11372 "scanner.c"
+#line 11382 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
@@ -11388,7 +11398,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp20_ = _tmp19_.lines;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11383 "scanner.c"
+#line 11393 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
@@ -11400,15 +11410,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp23_ = _tmp22_.lines;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11395 "scanner.c"
+#line 11405 "scanner.c"
 		} else {
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11399 "scanner.c"
+#line 11409 "scanner.c"
 		}
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_) {
-#line 11403 "scanner.c"
+#line 11413 "scanner.c"
 			gint _tmp24_ = 0;
 			SANE_Parameters _tmp25_ = {0};
 			gint _tmp26_ = 0;
@@ -11420,19 +11430,19 @@ static void scanner_do_read (Scanner* self) {
 			_tmp26_ = _tmp25_.lines;
 #line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1319: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
-#line 11415 "scanner.c"
+#line 11425 "scanner.c"
 		}
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = self->priv->n_used;
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ > 0) {
-#line 11421 "scanner.c"
+#line 11431 "scanner.c"
 			gint _tmp28_ = 0;
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = self->priv->n_used;
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1321: Scan complete with %d bytes of unused data", _tmp28_);
-#line 11427 "scanner.c"
+#line 11437 "scanner.c"
 		}
 #line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
@@ -11440,13 +11450,13 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11435 "scanner.c"
+#line 11445 "scanner.c"
 	}
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = status;
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp29_ != SANE_STATUS_GOOD) {
-#line 11441 "scanner.c"
+#line 11451 "scanner.c"
 		SANE_Status _tmp30_ = 0;
 		const gchar* _tmp31_ = NULL;
 		SANE_Status _tmp32_ = 0;
@@ -11467,7 +11477,7 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11462 "scanner.c"
+#line 11472 "scanner.c"
 	}
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
@@ -11475,7 +11485,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp35_ = self->priv->n_used;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp35_ == 0) {
-#line 11470 "scanner.c"
+#line 11480 "scanner.c"
 		SANE_Int _tmp36_ = {0};
 		guchar* _tmp37_ = NULL;
 		gint _tmp37__length1 = 0;
@@ -11487,17 +11497,17 @@ static void scanner_do_read (Scanner* self) {
 		_tmp37__length1 = self->priv->buffer_length1;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
-#line 11482 "scanner.c"
+#line 11492 "scanner.c"
 	} else {
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = FALSE;
-#line 11486 "scanner.c"
+#line 11496 "scanner.c"
 	}
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp34_) {
 #line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11492 "scanner.c"
+#line 11502 "scanner.c"
 	}
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->n_used;
@@ -11513,7 +11523,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp42_ = _tmp41_.bytes_per_line;
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_ >= _tmp42_) {
-#line 11508 "scanner.c"
+#line 11518 "scanner.c"
 		ScanLine* line = NULL;
 		ScanLine* _tmp43_ = NULL;
 		SANE_Parameters _tmp44_ = {0};
@@ -11574,7 +11584,7 @@ static void scanner_do_read (Scanner* self) {
 		switch (_tmp45_) {
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11569 "scanner.c"
+#line 11579 "scanner.c"
 			{
 				ScanLine* _tmp46_ = NULL;
 #line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11583,11 +11593,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp46_->channel = 0;
 #line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11578 "scanner.c"
+#line 11588 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11582 "scanner.c"
+#line 11592 "scanner.c"
 			{
 				ScanLine* _tmp47_ = NULL;
 #line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11596,11 +11606,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp47_->channel = -1;
 #line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11591 "scanner.c"
+#line 11601 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11595 "scanner.c"
+#line 11605 "scanner.c"
 			{
 				ScanLine* _tmp48_ = NULL;
 #line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11609,11 +11619,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp48_->channel = 0;
 #line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11604 "scanner.c"
+#line 11614 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11608 "scanner.c"
+#line 11618 "scanner.c"
 			{
 				ScanLine* _tmp49_ = NULL;
 #line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11622,11 +11632,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp49_->channel = 1;
 #line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11617 "scanner.c"
+#line 11627 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11621 "scanner.c"
+#line 11631 "scanner.c"
 			{
 				ScanLine* _tmp50_ = NULL;
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11635,12 +11645,12 @@ static void scanner_do_read (Scanner* self) {
 				_tmp50_->channel = 2;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11630 "scanner.c"
+#line 11640 "scanner.c"
 			}
 			default:
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11635 "scanner.c"
+#line 11645 "scanner.c"
 		}
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = line;
@@ -11718,7 +11728,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp73_ = full_read;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp73_) {
-#line 11713 "scanner.c"
+#line 11723 "scanner.c"
 			gint _tmp74_ = 0;
 			SANE_Parameters _tmp75_ = {0};
 			gint _tmp76_ = 0;
@@ -11730,7 +11740,7 @@ static void scanner_do_read (Scanner* self) {
 			_tmp76_ = _tmp75_.bytes_per_line;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp74_ + _tmp76_;
-#line 11725 "scanner.c"
+#line 11735 "scanner.c"
 		}
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp77_ = buffer_size;
@@ -11758,19 +11768,19 @@ static void scanner_do_read (Scanner* self) {
 		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11753 "scanner.c"
+#line 11763 "scanner.c"
 		{
 			gint i = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11758 "scanner.c"
+#line 11768 "scanner.c"
 			{
 				gboolean _tmp84_ = FALSE;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = TRUE;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11765 "scanner.c"
+#line 11775 "scanner.c"
 					gint _tmp86_ = 0;
 					gint _tmp87_ = 0;
 					guchar* _tmp88_ = NULL;
@@ -11789,13 +11799,13 @@ static void scanner_do_read (Scanner* self) {
 					gint _tmp99_ = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp84_) {
-#line 11784 "scanner.c"
+#line 11794 "scanner.c"
 						gint _tmp85_ = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = i;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp85_ + 1;
-#line 11790 "scanner.c"
+#line 11800 "scanner.c"
 					}
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = FALSE;
@@ -11807,7 +11817,7 @@ static void scanner_do_read (Scanner* self) {
 					if (!(_tmp86_ < _tmp87_)) {
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11802 "scanner.c"
+#line 11812 "scanner.c"
 					}
 #line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = self->priv->buffer;
@@ -11841,7 +11851,7 @@ static void scanner_do_read (Scanner* self) {
 					_tmp99_ = self->priv->n_used;
 #line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp99_ + 1;
-#line 11836 "scanner.c"
+#line 11846 "scanner.c"
 				}
 			}
 		}
@@ -11851,7 +11861,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp104_ = _tmp103_.depth;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp104_ == 8) {
-#line 11846 "scanner.c"
+#line 11856 "scanner.c"
 			SANE_Parameters _tmp105_ = {0};
 			SANE_Frame _tmp106_ = 0;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11860,15 +11870,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp106_ = _tmp105_.format;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
-#line 11855 "scanner.c"
+#line 11865 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
-#line 11859 "scanner.c"
+#line 11869 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp102_) {
-#line 11863 "scanner.c"
+#line 11873 "scanner.c"
 			ScanJob* _tmp107_ = NULL;
 			gint _tmp108_ = 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11877,15 +11887,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp108_ = _tmp107_->depth;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = _tmp108_ == 2;
-#line 11872 "scanner.c"
+#line 11882 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = FALSE;
-#line 11876 "scanner.c"
+#line 11886 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp101_) {
-#line 11880 "scanner.c"
+#line 11890 "scanner.c"
 			ScanJob* _tmp109_ = NULL;
 			ScanMode _tmp110_ = 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11894,15 +11904,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp110_ = _tmp109_->scan_mode;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
-#line 11889 "scanner.c"
+#line 11899 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = FALSE;
-#line 11893 "scanner.c"
+#line 11903 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_) {
-#line 11897 "scanner.c"
+#line 11907 "scanner.c"
 			guchar block = '\0';
 			gint write_offset = 0;
 			gint block_shift = 0;
@@ -11915,19 +11925,19 @@ static void scanner_do_read (Scanner* self) {
 			write_offset = 0;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 11910 "scanner.c"
+#line 11920 "scanner.c"
 			{
 				gint i = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 11915 "scanner.c"
+#line 11925 "scanner.c"
 				{
 					gboolean _tmp111_ = FALSE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp111_ = TRUE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 11922 "scanner.c"
+#line 11932 "scanner.c"
 						gint _tmp113_ = 0;
 						ScanLine* _tmp114_ = NULL;
 						gint _tmp115_ = 0;
@@ -11938,13 +11948,13 @@ static void scanner_do_read (Scanner* self) {
 						gint _tmp143_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp111_) {
-#line 11933 "scanner.c"
+#line 11943 "scanner.c"
 							gint _tmp112_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp112_ + 1;
-#line 11939 "scanner.c"
+#line 11949 "scanner.c"
 						}
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp111_ = FALSE;
@@ -11958,7 +11968,7 @@ static void scanner_do_read (Scanner* self) {
 						if (!(_tmp113_ < _tmp115_)) {
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 11953 "scanner.c"
+#line 11963 "scanner.c"
 						}
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = i;
@@ -11968,19 +11978,19 @@ static void scanner_do_read (Scanner* self) {
 						_tmp118_ = _tmp117_->data_length;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp116_ * _tmp118_;
-#line 11963 "scanner.c"
+#line 11973 "scanner.c"
 						{
 							gint x = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 11968 "scanner.c"
+#line 11978 "scanner.c"
 							{
 								gboolean _tmp119_ = FALSE;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp119_ = TRUE;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 11975 "scanner.c"
+#line 11985 "scanner.c"
 									gint _tmp121_ = 0;
 									ScanLine* _tmp122_ = NULL;
 									gint _tmp123_ = 0;
@@ -11999,13 +12009,13 @@ static void scanner_do_read (Scanner* self) {
 									gint _tmp135_ = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp119_) {
-#line 11994 "scanner.c"
+#line 12004 "scanner.c"
 										gint _tmp120_ = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp120_ = x;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp120_ + 1;
-#line 12000 "scanner.c"
+#line 12010 "scanner.c"
 									}
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp119_ = FALSE;
@@ -12019,7 +12029,7 @@ static void scanner_do_read (Scanner* self) {
 									if (!(_tmp121_ < _tmp123_)) {
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 12014 "scanner.c"
+#line 12024 "scanner.c"
 									}
 #line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp124_ = line;
@@ -12041,7 +12051,7 @@ static void scanner_do_read (Scanner* self) {
 									if (((gint) _tmp129_) >= 192) {
 #line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12036 "scanner.c"
+#line 12046 "scanner.c"
 									} else {
 										guchar _tmp130_ = '\0';
 #line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12050,7 +12060,7 @@ static void scanner_do_read (Scanner* self) {
 										if (((gint) _tmp130_) >= 128) {
 #line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12045 "scanner.c"
+#line 12055 "scanner.c"
 										} else {
 											guchar _tmp131_ = '\0';
 #line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12059,11 +12069,11 @@ static void scanner_do_read (Scanner* self) {
 											if (((gint) _tmp131_) >= 64) {
 #line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12054 "scanner.c"
+#line 12064 "scanner.c"
 											} else {
 #line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12058 "scanner.c"
+#line 12068 "scanner.c"
 											}
 										}
 									}
@@ -12079,7 +12089,7 @@ static void scanner_do_read (Scanner* self) {
 									_tmp135_ = block_shift;
 #line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp135_ == 0) {
-#line 12074 "scanner.c"
+#line 12084 "scanner.c"
 										ScanLine* _tmp136_ = NULL;
 										guchar* _tmp137_ = NULL;
 										gint _tmp137__length1 = 0;
@@ -12109,14 +12119,14 @@ static void scanner_do_read (Scanner* self) {
 										block = (guchar) 0;
 #line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12104 "scanner.c"
+#line 12114 "scanner.c"
 									} else {
 										gint _tmp142_ = 0;
 #line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp142_ = block_shift;
 #line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp142_ - 2;
-#line 12111 "scanner.c"
+#line 12121 "scanner.c"
 									}
 								}
 							}
@@ -12125,7 +12135,7 @@ static void scanner_do_read (Scanner* self) {
 						_tmp143_ = block_shift;
 #line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp143_ != 6) {
-#line 12120 "scanner.c"
+#line 12130 "scanner.c"
 							ScanLine* _tmp144_ = NULL;
 							guchar* _tmp145_ = NULL;
 							gint _tmp145__length1 = 0;
@@ -12155,7 +12165,7 @@ static void scanner_do_read (Scanner* self) {
 							block = (guchar) 0;
 #line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12150 "scanner.c"
+#line 12160 "scanner.c"
 						}
 					}
 				}
@@ -12168,7 +12178,7 @@ static void scanner_do_read (Scanner* self) {
 			_tmp152_ = _tmp151_->width;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
-#line 12163 "scanner.c"
+#line 12173 "scanner.c"
 		}
 #line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = job;
@@ -12186,18 +12196,18 @@ static void scanner_do_read (Scanner* self) {
 		_notify_unref0 (_tmp157_);
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12181 "scanner.c"
+#line 12191 "scanner.c"
 	}
 #line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12185 "scanner.c"
+#line 12195 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
 #line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12192 "scanner.c"
+#line 12202 "scanner.c"
 }
 
 
@@ -12241,7 +12251,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	_tmp5_ = status;
 #line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12236 "scanner.c"
+#line 12246 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12254,7 +12264,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		result = NULL;
 #line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12249 "scanner.c"
+#line 12259 "scanner.c"
 	}
 #line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
@@ -12274,7 +12284,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	scanner_redetect (self);
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12269 "scanner.c"
+#line 12279 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12283,7 +12293,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		if (!_tmp14_) {
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12278 "scanner.c"
+#line 12288 "scanner.c"
 		}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
@@ -12291,7 +12301,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		switch (_tmp15_) {
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12286 "scanner.c"
+#line 12296 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
 #line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12302,83 +12312,83 @@ static void* scanner_scan_thread (Scanner* self) {
 					scanner_set_scanning (self, TRUE);
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12297 "scanner.c"
+#line 12307 "scanner.c"
 				}
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12301 "scanner.c"
+#line 12311 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12305 "scanner.c"
+#line 12315 "scanner.c"
 			{
 #line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12311 "scanner.c"
+#line 12321 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12315 "scanner.c"
+#line 12325 "scanner.c"
 			{
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12321 "scanner.c"
+#line 12331 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12325 "scanner.c"
+#line 12335 "scanner.c"
 			{
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12331 "scanner.c"
+#line 12341 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12335 "scanner.c"
+#line 12345 "scanner.c"
 			{
 #line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
 #line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12341 "scanner.c"
+#line 12351 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12345 "scanner.c"
+#line 12355 "scanner.c"
 			{
 #line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
 #line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12351 "scanner.c"
+#line 12361 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12355 "scanner.c"
+#line 12365 "scanner.c"
 			{
 #line 1487 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12361 "scanner.c"
+#line 12371 "scanner.c"
 			}
 			default:
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12366 "scanner.c"
+#line 12376 "scanner.c"
 		}
 	}
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12373 "scanner.c"
+#line 12383 "scanner.c"
 }
 
 
@@ -12389,7 +12399,7 @@ static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	scanner_unref (self);
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12384 "scanner.c"
+#line 12394 "scanner.c"
 }
 
 
@@ -12397,7 +12407,7 @@ void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
 #line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12392 "scanner.c"
+#line 12402 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
@@ -12407,8 +12417,8 @@ void scanner_start (Scanner* self) {
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp1_;
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_inner_error_ != NULL) {
-#line 12403 "scanner.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12413 "scanner.c"
 			goto __catch15_g_error;
 		}
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12421,7 +12431,7 @@ void scanner_start (Scanner* self) {
 		self->priv->thread = _tmp2_;
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (_tmp0_);
-#line 12416 "scanner.c"
+#line 12426 "scanner.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
@@ -12441,18 +12451,18 @@ void scanner_start (Scanner* self) {
 		g_critical ("scanner.vala:1503: Unable to create thread: %s", _tmp4_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12436 "scanner.c"
+#line 12446 "scanner.c"
 	}
 	__finally15:
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12447 "scanner.c"
+#line 12457 "scanner.c"
 	}
 }
 
@@ -12469,7 +12479,7 @@ void scanner_redetect (Scanner* self) {
 	if (_tmp0_) {
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12464 "scanner.c"
+#line 12474 "scanner.c"
 	}
 #line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
@@ -12481,7 +12491,7 @@ void scanner_redetect (Scanner* self) {
 	_tmp2_ = request_redetect_new ();
 #line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12476 "scanner.c"
+#line 12486 "scanner.c"
 }
 
 
@@ -12496,7 +12506,7 @@ gboolean scanner_is_scanning (Scanner* self) {
 	result = _tmp0_;
 #line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12491 "scanner.c"
+#line 12501 "scanner.c"
 }
 
 
@@ -12511,7 +12521,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	switch (_tmp0_) {
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12506 "scanner.c"
+#line 12516 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12520,11 +12530,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp1_;
 #line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12515 "scanner.c"
+#line 12525 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12519 "scanner.c"
+#line 12529 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12533,11 +12543,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp2_;
 #line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12528 "scanner.c"
+#line 12538 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12532 "scanner.c"
+#line 12542 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12546,11 +12556,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp3_;
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12541 "scanner.c"
+#line 12551 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12545 "scanner.c"
+#line 12555 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12559,7 +12569,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp4_;
 #line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12554 "scanner.c"
+#line 12564 "scanner.c"
 		}
 		default:
 		{
@@ -12573,7 +12583,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp6_;
 #line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12568 "scanner.c"
+#line 12578 "scanner.c"
 		}
 	}
 }
@@ -12590,7 +12600,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	switch (_tmp0_) {
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12585 "scanner.c"
+#line 12595 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12599,11 +12609,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp1_;
 #line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12594 "scanner.c"
+#line 12604 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12598 "scanner.c"
+#line 12608 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12612,11 +12622,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp2_;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12607 "scanner.c"
+#line 12617 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12611 "scanner.c"
+#line 12621 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12625,11 +12635,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp3_;
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12620 "scanner.c"
+#line 12630 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12624 "scanner.c"
+#line 12634 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12638,7 +12648,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp4_;
 #line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12633 "scanner.c"
+#line 12643 "scanner.c"
 		}
 		default:
 		{
@@ -12652,7 +12662,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp6_;
 #line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12647 "scanner.c"
+#line 12657 "scanner.c"
 		}
 	}
 }
@@ -12723,17 +12733,17 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	_tmp1_ = device;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12718 "scanner.c"
+#line 12728 "scanner.c"
 		const gchar* _tmp2_ = NULL;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12724 "scanner.c"
+#line 12734 "scanner.c"
 	} else {
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12728 "scanner.c"
+#line 12738 "scanner.c"
 	}
 #line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = options;
@@ -12883,7 +12893,7 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	g_async_queue_push (_tmp54_, _tmp55_);
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12876 "scanner.c"
+#line 12886 "scanner.c"
 }
 
 
@@ -12903,14 +12913,14 @@ void scanner_cancel (Scanner* self) {
 	_tmp2_ = request_cancel_new ();
 #line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12896 "scanner.c"
+#line 12906 "scanner.c"
 }
 
 
 static gpointer _g_thread_ref0 (gpointer self) {
 #line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? g_thread_ref (self) : NULL;
-#line 12903 "scanner.c"
+#line 12913 "scanner.c"
 }
 
 
@@ -12932,7 +12942,7 @@ void scanner_free (Scanner* self) {
 	_tmp2_ = self->priv->thread;
 #line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 12925 "scanner.c"
+#line 12935 "scanner.c"
 		GThread* _tmp3_ = NULL;
 		GThread* _tmp4_ = NULL;
 #line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12945,13 +12955,13 @@ void scanner_free (Scanner* self) {
 		_g_thread_unref0 (self->priv->thread);
 #line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 12938 "scanner.c"
+#line 12948 "scanner.c"
 	}
 #line 1596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
 #line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1597: sane_exit ()");
-#line 12944 "scanner.c"
+#line 12954 "scanner.c"
 }
 
 
@@ -12970,19 +12980,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12963 "scanner.c"
+#line 12973 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12969 "scanner.c"
+#line 12979 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
-#line 12975 "scanner.c"
+#line 12985 "scanner.c"
 }
 
 
@@ -13001,19 +13011,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12994 "scanner.c"
+#line 13004 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13000 "scanner.c"
+#line 13010 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
-#line 13006 "scanner.c"
+#line 13016 "scanner.c"
 }
 
 
@@ -13032,26 +13042,26 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13025 "scanner.c"
+#line 13035 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13031 "scanner.c"
+#line 13041 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 13037 "scanner.c"
+#line 13047 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 13044 "scanner.c"
+#line 13054 "scanner.c"
 }
 
 
@@ -13060,7 +13070,7 @@ static void value_scanner_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
-#line 13053 "scanner.c"
+#line 13063 "scanner.c"
 	}
 }
 
@@ -13070,11 +13080,11 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
-#line 13063 "scanner.c"
+#line 13073 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13067 "scanner.c"
+#line 13077 "scanner.c"
 	}
 }
 
@@ -13082,37 +13092,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_scanner_peek_pointer (const GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13075 "scanner.c"
+#line 13085 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 13082 "scanner.c"
+#line 13092 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13089 "scanner.c"
+#line 13099 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13093 "scanner.c"
+#line 13103 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13097 "scanner.c"
+#line 13107 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13101 "scanner.c"
+#line 13111 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13105 "scanner.c"
+#line 13115 "scanner.c"
 }
 
 
@@ -13123,25 +13133,25 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13116 "scanner.c"
+#line 13126 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 13122 "scanner.c"
+#line 13132 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13126 "scanner.c"
+#line 13136 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13130 "scanner.c"
+#line 13140 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13134 "scanner.c"
+#line 13144 "scanner.c"
 }
 
 
@@ -13155,7 +13165,7 @@ GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 13148 "scanner.c"
+#line 13158 "scanner.c"
 }
 
 
@@ -13164,7 +13174,7 @@ gpointer value_get_scanner (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13157 "scanner.c"
+#line 13167 "scanner.c"
 }
 
 
@@ -13184,17 +13194,17 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
-#line 13177 "scanner.c"
+#line 13187 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13181 "scanner.c"
+#line 13191 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13187 "scanner.c"
+#line 13197 "scanner.c"
 	}
 }
 
@@ -13213,17 +13223,17 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 13206 "scanner.c"
+#line 13216 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13210 "scanner.c"
+#line 13220 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13216 "scanner.c"
+#line 13226 "scanner.c"
 	}
 }
 
@@ -13232,7 +13242,7 @@ static void scanner_class_init (ScannerClass * klass) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_parent_class = g_type_class_peek_parent (klass);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	SCANNER_CLASS (klass)->finalize = scanner_finalize;
+	((ScannerClass *) klass)->finalize = scanner_finalize;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (ScannerPrivate));
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -13253,7 +13263,7 @@ static void scanner_class_init (ScannerClass * klass) {
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13246 "scanner.c"
+#line 13256 "scanner.c"
 }
 
 
@@ -13262,7 +13272,7 @@ static void scanner_instance_init (Scanner * self) {
 	self->priv = SCANNER_GET_PRIVATE (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 13255 "scanner.c"
+#line 13265 "scanner.c"
 }
 
 
@@ -13270,6 +13280,8 @@ static void scanner_finalize (Scanner* obj) {
 	Scanner * self;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCANNER, Scanner);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_thread_unref0 (self->priv->thread);
 #line 217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -13288,7 +13300,7 @@ static void scanner_finalize (Scanner* obj) {
 	_g_hash_table_unref0 (self->priv->options);
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 13281 "scanner.c"
+#line 13293 "scanner.c"
 }
 
 
@@ -13313,7 +13325,7 @@ gpointer scanner_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 13306 "scanner.c"
+#line 13318 "scanner.c"
 }
 
 
@@ -13326,7 +13338,7 @@ void scanner_unref (gpointer instance) {
 		SCANNER_GET_CLASS (self)->finalize (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13319 "scanner.c"
+#line 13331 "scanner.c"
 	}
 }
 
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 144a78d..3036fc9 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.24.0, the Vala compiler
+/* simple-scan.c generated by valac 0.26.1, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -580,7 +580,7 @@ static void simple_scan_real_startup (GApplication* base) {
 #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"
-	G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+	G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = user_interface_new ();
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -735,7 +735,7 @@ static void simple_scan_real_activate (GApplication* base) {
 #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"
-	G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+	G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
 #line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
 #line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -754,7 +754,7 @@ static void simple_scan_real_shutdown (GApplication* base) {
 #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"
-	G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+	G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1299,7 +1299,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1304 "simple-scan.c"
 			goto __catch4_g_error;
 		}
@@ -1334,7 +1334,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	}
 	__finally4:
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1362,7 +1362,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 #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) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1367 "simple-scan.c"
 			goto __catch5_g_error;
 		}
@@ -1413,7 +1413,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	}
 	__finally5:
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1435,7 +1435,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_device_connect_sync (_tmp15_, NULL, &_inner_error_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1440 "simple-scan.c"
 			goto __catch6_g_error;
 		}
@@ -1475,7 +1475,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	}
 	__finally6:
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1527,7 +1527,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_profile_connect_sync (_tmp23_, NULL, &_inner_error_);
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1532 "simple-scan.c"
 			goto __catch7_g_error;
 		}
@@ -1569,7 +1569,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	}
 	__finally7:
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2056,7 +2056,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fd = _tmp5_;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2060 "simple-scan.c"
 			goto __catch8_g_error;
 		}
@@ -2096,7 +2096,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	}
 	__finally8:
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2188,7 +2188,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2192 "simple-scan.c"
 					goto __catch9_g_error;
 				}
@@ -2228,7 +2228,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			}
 			__finally9:
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_inner_error_ != NULL) {
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2368,7 +2368,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_page_unref0 (_tmp31_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (_inner_error_ != NULL) {
+						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2372 "simple-scan.c"
 							goto __catch10_g_error;
 						}
@@ -2403,7 +2403,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 					}
 					__finally10:
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_inner_error_ != NULL) {
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2467,7 +2467,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_spawn_command_line_async (_tmp43_, &_inner_error_);
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2471 "simple-scan.c"
 			goto __catch11_g_error;
 		}
@@ -2494,7 +2494,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	}
 	__finally11:
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (command_line);
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2697,37 +2697,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2712 "simple-scan.c"
 		glong _tmp4_ = 0L;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
 #line 2720 "simple-scan.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
 #line 2732 "simple-scan.c"
 	}
@@ -2747,112 +2747,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1204 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 2756 "simple-scan.c"
 		glong _tmp2_ = 0L;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 2762 "simple-scan.c"
 	} else {
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 2766 "simple-scan.c"
 	}
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 2770 "simple-scan.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 2782 "simple-scan.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 2792 "simple-scan.c"
 	}
-#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 2798 "simple-scan.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 2812 "simple-scan.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 2822 "simple-scan.c"
 	}
-#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 2828 "simple-scan.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 2837 "simple-scan.c"
 	}
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
 #line 2857 "simple-scan.c"
 }
@@ -2901,7 +2901,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_data_size_ = data_length1;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_propagate_error (error, _inner_error_);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3470,7 +3470,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 
 
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_cb (log_domain, log_levels, message);
 #line 3475 "simple-scan.c"
 }
@@ -3514,33 +3514,31 @@ gint simple_scan_main (gchar** args, int args_length1) {
 #line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	textdomain (GETTEXT_PACKAGE);
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	gtk_init (&args_length1, &args);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = _ ("[DEVICE...] - Scanning utility");
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_option_context_new (_tmp0_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	c = _tmp1_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = c;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = c;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = gtk_get_option_group (TRUE);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_group (_tmp3_, _tmp4_);
-#line 3534 "simple-scan.c"
+#line 3532 "simple-scan.c"
 	{
 		GOptionContext* _tmp5_ = NULL;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = c;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
-#line 3543 "simple-scan.c"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3541 "simple-scan.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -3557,103 +3555,103 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp11__length1 = 0;
 		const gchar* _tmp12_ = NULL;
 		FILE* _tmp13_ = NULL;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = stderr;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp6_, "%s\n", _tmp8_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = stderr;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = _ ("Run '%s --help' to see a full list of available command line options.");
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = args;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11__length1 = args_length1;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = _tmp11_[0];
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp9_, _tmp10_, _tmp12_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = stderr;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp13_, "\n");
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_FAILURE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3596 "simple-scan.c"
+#line 3594 "simple-scan.c"
 	}
 	__finally12:
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return 0;
-#line 3609 "simple-scan.c"
+#line 3607 "simple-scan.c"
 	}
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = simple_scan_show_version;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp14_) {
-#line 3615 "simple-scan.c"
+#line 3613 "simple-scan.c"
 		FILE* _tmp15_ = NULL;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = stderr;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp15_, "simple-scan %s\n", VERSION);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3627 "simple-scan.c"
+#line 3625 "simple-scan.c"
 	}
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = simple_scan_fix_pdf_filename;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp16_ != NULL) {
-#line 3633 "simple-scan.c"
+#line 3631 "simple-scan.c"
 		{
 			const gchar* _tmp17_ = NULL;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = simple_scan_fix_pdf_filename;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_inner_error_ != NULL) {
-#line 3642 "simple-scan.c"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3640 "simple-scan.c"
 				goto __catch13_g_error;
 			}
 			{
 				gint i = 0;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
-#line 3649 "simple-scan.c"
+#line 3647 "simple-scan.c"
 				{
 					gboolean _tmp18_ = FALSE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = TRUE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
-#line 3656 "simple-scan.c"
+#line 3654 "simple-scan.c"
 						gint _tmp20_ = 0;
 						gchar** _tmp21_ = NULL;
 						gint _tmp21__length1 = 0;
@@ -3661,43 +3659,43 @@ gint simple_scan_main (gchar** args, int args_length1) {
 						gint _tmp22__length1 = 0;
 						gint _tmp23_ = 0;
 						const gchar* _tmp24_ = NULL;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!_tmp18_) {
-#line 3666 "simple-scan.c"
+#line 3664 "simple-scan.c"
 							gint _tmp19_ = 0;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp19_ = i;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp19_ + 1;
-#line 3672 "simple-scan.c"
+#line 3670 "simple-scan.c"
 						}
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp18_ = FALSE;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp20_ = i;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21_ = args;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21__length1 = args_length1;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!(_tmp20_ < _tmp21__length1)) {
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
-#line 3686 "simple-scan.c"
+#line 3684 "simple-scan.c"
 						}
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22_ = args;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22__length1 = args_length1;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp23_ = i;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp24_ = _tmp22_[_tmp23_];
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						simple_scan_fix_pdf (_tmp24_, &_inner_error_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (_inner_error_ != NULL) {
-#line 3700 "simple-scan.c"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3698 "simple-scan.c"
 							goto __catch13_g_error;
 						}
 					}
@@ -3711,58 +3709,58 @@ gint simple_scan_main (gchar** args, int args_length1) {
 			FILE* _tmp25_ = NULL;
 			GError* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_inner_error_ = NULL;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = stderr;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = e;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = _tmp26_->message;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp25_, "Error fixing PDF file: %s", _tmp27_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			result = EXIT_FAILURE;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_error_free0 (e);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
-#line 3734 "simple-scan.c"
+#line 3732 "simple-scan.c"
 		}
 		__finally13:
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_inner_error_ != NULL) {
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_clear_error (&_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return 0;
-#line 3747 "simple-scan.c"
+#line 3745 "simple-scan.c"
 		}
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3755 "simple-scan.c"
+#line 3753 "simple-scan.c"
 	}
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = args;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28__length1 = args_length1;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp28__length1 > 1) {
-#line 3765 "simple-scan.c"
+#line 3763 "simple-scan.c"
 		ScanDevice* _tmp29_ = NULL;
 		ScanDevice* _tmp30_ = NULL;
 		gchar** _tmp31_ = NULL;
@@ -3774,80 +3772,82 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp35__length1 = 0;
 		const gchar* _tmp36_ = NULL;
 		gchar* _tmp37_ = NULL;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp29_ = scan_device_new ();
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_scan_device_unref0 (device);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp29_;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = device;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_ = args;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31__length1 = args_length1;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp32_ = _tmp31_[1];
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp33_ = g_strdup (_tmp32_);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp30_->name);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_->name = _tmp33_;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_ = device;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35_ = args;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35__length1 = args_length1;
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp36_ = _tmp35_[1];
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp37_ = g_strdup (_tmp36_);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp34_->label);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_->label = _tmp37_;
-#line 3811 "simple-scan.c"
+#line 3809 "simple-scan.c"
 	}
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp38_ = g_timer_new ();
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_timer_destroy0 (simple_scan_log_timer);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_timer = _tmp38_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp39_ = g_get_user_cache_dir ();
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp40_ = g_build_filename (_tmp39_, "simple-scan", NULL, NULL);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp40_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp41_ = path;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_mkdir_with_parents (_tmp41_, 0700);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp42_ = g_get_user_cache_dir ();
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp43_ = g_build_filename (_tmp42_, "simple-scan", "simple-scan.log", NULL, NULL);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp43_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp44_ = path;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = g_fopen (_tmp44_, "w");
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (simple_scan_log_file);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_file = _tmp45_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp46_ = getpid ();
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:594: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:596: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
+	gtk_init (&args_length1, &args);
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = device;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3890,11 +3890,11 @@ static void simple_scan_class_init (SimpleScanClass * klass) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_type_class_add_private (klass, sizeof (SimpleScanPrivate));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	G_APPLICATION_CLASS (klass)->startup = simple_scan_real_startup;
+	((GApplicationClass *) klass)->startup = simple_scan_real_startup;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	G_APPLICATION_CLASS (klass)->activate = simple_scan_real_activate;
+	((GApplicationClass *) klass)->activate = simple_scan_real_activate;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	G_APPLICATION_CLASS (klass)->shutdown = simple_scan_real_shutdown;
+	((GApplicationClass *) 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 3900 "simple-scan.c"
@@ -3937,7 +3937,7 @@ GType simple_scan_get_type (void) {
 	if (g_once_init_enter (&simple_scan_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SimpleScanClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) simple_scan_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SimpleScan), 0, (GInstanceInitFunc) simple_scan_instance_init, NULL };
 		GType simple_scan_type_id;
-		simple_scan_type_id = g_type_register_static (GTK_TYPE_APPLICATION, "SimpleScan", &g_define_type_info, 0);
+		simple_scan_type_id = g_type_register_static (gtk_application_get_type (), "SimpleScan", &g_define_type_info, 0);
 		g_once_init_leave (&simple_scan_type_id__volatile, simple_scan_type_id);
 	}
 	return simple_scan_type_id__volatile;
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 813f29b..eaa8b59 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -537,8 +537,6 @@ public class SimpleScan : Gtk.Application
         Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         Intl.textdomain (GETTEXT_PACKAGE);
 
-        Gtk.init (ref args);
-
         var c = new OptionContext (/* Arguments and description for --help text */
                                    _("[DEVICE...] - Scanning utility"));
         c.add_main_entries (options, GETTEXT_PACKAGE);
@@ -595,6 +593,8 @@ public class SimpleScan : Gtk.Application
 
         debug ("Starting Simple Scan %s, PID=%i", VERSION, Posix.getpid ());
 
+        Gtk.init (ref args);
+
         var app = new SimpleScan (device);
         return app.run ();
     }
diff --git a/src/ui.c b/src/ui.c
index 340b940..2bfb29a 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.24.0, the Vala compiler
+/* ui.c generated by valac 0.26.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -545,20 +545,20 @@ static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activ
 static void user_interface_reorder_document (UserInterface* self);
 static Block1Data* block1_data_ref (Block1Data* _data1_);
 static void block1_data_unref (void * _userdata_);
-static gboolean __lambda4_ (Block1Data* _data1_, GdkEventKey* e);
-static gboolean ___lambda4__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
+static gboolean __lambda5_ (Block1Data* _data1_, GdkEventKey* e);
+static gboolean ___lambda5__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
 static GtkButton* user_interface_make_reorder_button (UserInterface* self, const gchar* text, const gchar* items);
-static void __lambda5_ (Block1Data* _data1_);
-void book_combine_sides (Book* self);
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void __lambda6_ (Block1Data* _data1_);
-void book_combine_sides_reverse (Book* self);
+void book_combine_sides (Book* self);
 static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void __lambda7_ (Block1Data* _data1_);
-void book_reverse (Book* self);
+void book_combine_sides_reverse (Book* self);
 static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void __lambda8_ (Block1Data* _data1_);
+void book_reverse (Book* self);
 static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda9_ (Block1Data* _data1_);
+static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
 static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar* items);
@@ -606,25 +606,25 @@ 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 gboolean user_interface_get_shell_shows_menubar (UserInterface* self);
+static gboolean user_interface_is_desktop (UserInterface* self, const gchar* name);
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self);
-static void __lambda10_ (UserInterface* self);
-static void ___lambda10__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda11_ (UserInterface* self);
 static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda12_ (UserInterface* self);
 static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda13_ (UserInterface* self);
 static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-void user_interface_set_brightness (UserInterface* self, gint value);
 static void __lambda14_ (UserInterface* self);
-static void ___lambda14__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_contrast (UserInterface* self, gint value);
+static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+void user_interface_set_brightness (UserInterface* self, gint value);
 static void __lambda15_ (UserInterface* self);
 static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_quality (UserInterface* self, gint value);
+void user_interface_set_contrast (UserInterface* self, gint value);
 static void __lambda16_ (UserInterface* self);
 static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_quality (UserInterface* self, gint value);
+static void __lambda17_ (UserInterface* self);
+static void ___lambda17__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);
@@ -639,10 +639,10 @@ 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 ___lambda9_ (UserInterface* self);
-static gboolean ____lambda9__gsource_func (gpointer self);
-static gboolean ___lambda17_ (UserInterface* self);
-static gboolean ____lambda17__gsource_func (gpointer self);
+static gboolean ___lambda10_ (UserInterface* self);
+static gboolean ____lambda10__gsource_func (gpointer self);
+static gboolean ___lambda18_ (UserInterface* self);
+static gboolean ____lambda18__gsource_func (gpointer self);
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value);
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value);
 void user_interface_start (UserInterface* self);
@@ -680,104 +680,105 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c);
 static void page_icon_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 gint _vala_array_length (gpointer array);
 
 static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"reorder", _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
 
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
-#line 690 "ui.c"
+#line 691 "ui.c"
 }
 
 
 static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) {
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reordered_cb ((UserInterface*) self, _sender);
-#line 697 "ui.c"
+#line 698 "ui.c"
 }
 
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_removed_cb ((UserInterface*) self, _sender, page);
-#line 704 "ui.c"
+#line 705 "ui.c"
 }
 
 
 static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document_activate_cb ((UserInterface*) self);
-#line 711 "ui.c"
+#line 712 "ui.c"
 }
 
 
 static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document_activate_cb ((UserInterface*) self);
-#line 718 "ui.c"
+#line 719 "ui.c"
 }
 
 
 static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document_activate_cb ((UserInterface*) self);
-#line 725 "ui.c"
+#line 726 "ui.c"
 }
 
 
 static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_document_activate_cb ((UserInterface*) self);
-#line 732 "ui.c"
+#line 733 "ui.c"
 }
 
 
 static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_document_activate_cb ((UserInterface*) self);
-#line 739 "ui.c"
+#line 740 "ui.c"
 }
 
 
 static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document_activate_cb ((UserInterface*) self);
-#line 746 "ui.c"
+#line 747 "ui.c"
 }
 
 
 static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_activate_cb ((UserInterface*) self);
-#line 753 "ui.c"
+#line 754 "ui.c"
 }
 
 
 static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_activate_cb ((UserInterface*) self);
-#line 760 "ui.c"
+#line 761 "ui.c"
 }
 
 
 static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_activate_cb ((UserInterface*) self);
-#line 767 "ui.c"
+#line 768 "ui.c"
 }
 
 
 static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_activate_cb ((UserInterface*) self);
-#line 774 "ui.c"
+#line 775 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
-#line 781 "ui.c"
+#line 782 "ui.c"
 }
 
 
@@ -851,7 +852,7 @@ UserInterface* user_interface_construct (GType object_type) {
 	_tmp12_ = _tmp11_;
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ == ((guint) 0)) {
-#line 855 "ui.c"
+#line 856 "ui.c"
 		Book* _tmp13_ = NULL;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
@@ -859,7 +860,7 @@ UserInterface* user_interface_construct (GType object_type) {
 		_tmp13_ = self->priv->_book;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_set_needs_saving (_tmp13_, FALSE);
-#line 863 "ui.c"
+#line 864 "ui.c"
 	} else {
 		BookView* _tmp14_ = NULL;
 		Book* _tmp15_ = NULL;
@@ -877,7 +878,7 @@ UserInterface* user_interface_construct (GType object_type) {
 		book_view_set_selected_page (_tmp14_, _tmp17_);
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (_tmp17_);
-#line 881 "ui.c"
+#line 882 "ui.c"
 	}
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->_book;
@@ -885,14 +886,14 @@ UserInterface* user_interface_construct (GType object_type) {
 	g_signal_connect_object (_tmp18_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self, 0);
 #line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 889 "ui.c"
+#line 890 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
 #line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 896 "ui.c"
+#line 897 "ui.c"
 }
 
 
@@ -917,14 +918,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	_vala_iter = _tmp1_;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 921 "ui.c"
+#line 922 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 928 "ui.c"
+#line 929 "ui.c"
 				gchar* d = NULL;
 				GtkListStore* _tmp8_ = NULL;
 				GtkTreeIter _tmp9_ = {0};
@@ -932,14 +933,14 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				const gchar* _tmp11_ = NULL;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 936 "ui.c"
+#line 937 "ui.c"
 					gboolean _tmp4_ = FALSE;
 					gboolean _tmp5_ = FALSE;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = have_iter;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 943 "ui.c"
+#line 944 "ui.c"
 						GtkListStore* _tmp6_ = NULL;
 						gboolean _tmp7_ = FALSE;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -948,17 +949,17 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = _tmp7_;
-#line 952 "ui.c"
+#line 953 "ui.c"
 					} else {
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = FALSE;
-#line 956 "ui.c"
+#line 957 "ui.c"
 					}
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp4_) {
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 962 "ui.c"
+#line 963 "ui.c"
 					}
 				}
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -977,11 +978,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
-#line 981 "ui.c"
+#line 982 "ui.c"
 				}
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 985 "ui.c"
+#line 986 "ui.c"
 			}
 		}
 	}
@@ -991,11 +992,11 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	if (iter) {
 #line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 995 "ui.c"
+#line 996 "ui.c"
 	}
 #line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 999 "ui.c"
+#line 1000 "ui.c"
 }
 
 
@@ -1031,7 +1032,7 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	gtk_widget_destroy ((GtkWidget*) dialog);
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1035 "ui.c"
+#line 1036 "ui.c"
 }
 
 
@@ -1122,21 +1123,21 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	if (username) {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 1126 "ui.c"
+#line 1127 "ui.c"
 	} else {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 1130 "ui.c"
+#line 1131 "ui.c"
 	}
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
-#line 1136 "ui.c"
+#line 1137 "ui.c"
 	} else {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 1140 "ui.c"
+#line 1141 "ui.c"
 	}
 }
 
@@ -1157,7 +1158,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	if (_tmp0_) {
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 1161 "ui.c"
+#line 1162 "ui.c"
 	}
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
@@ -1173,7 +1174,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	_g_free0 (_tmp3_);
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1177 "ui.c"
+#line 1178 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -1190,7 +1191,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
-#line 1194 "ui.c"
+#line 1195 "ui.c"
 	}
 }
 
@@ -1198,7 +1199,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_device_combo_changed_cb ((UserInterface*) self, _sender);
-#line 1202 "ui.c"
+#line 1203 "ui.c"
 }
 
 
@@ -1235,7 +1236,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	_tmp0_ = self->priv->have_error;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1239 "ui.c"
+#line 1240 "ui.c"
 		gchar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -1272,7 +1273,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		_tmp6_ = self->priv->error_change_scanner_hint;
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 1276 "ui.c"
+#line 1277 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
@@ -1282,7 +1283,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
 #line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
-#line 1286 "ui.c"
+#line 1287 "ui.c"
 			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -1312,7 +1313,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			_g_free0 (text);
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			text = _tmp13_;
-#line 1316 "ui.c"
+#line 1317 "ui.c"
 		} else {
 			GtkInfoBar* _tmp14_ = NULL;
 #line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1327,7 +1328,7 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			_g_free0 (title);
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
-#line 1331 "ui.c"
+#line 1332 "ui.c"
 		}
 	}
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1380,14 +1381,14 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	_g_free0 (text);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1384 "ui.c"
+#line 1385 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 1391 "ui.c"
+#line 1392 "ui.c"
 }
 
 
@@ -1409,7 +1410,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 	_tmp0_ = self->priv->user_selected_device;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1413 "ui.c"
+#line 1414 "ui.c"
 		GtkComboBox* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
@@ -1421,13 +1422,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 		_tmp3_ = _tmp2_;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp3_ >= 0;
-#line 1425 "ui.c"
+#line 1426 "ui.c"
 	}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = devices;
-#line 1431 "ui.c"
+#line 1432 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1435,14 +1436,14 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 		device_collection = _tmp4_;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1439 "ui.c"
+#line 1440 "ui.c"
 			ScanDevice* _tmp5_ = NULL;
 			ScanDevice* device = NULL;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp5_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			device = _tmp5_;
-#line 1446 "ui.c"
+#line 1447 "ui.c"
 			{
 				gint n_delete = 0;
 				GtkListStore* _tmp6_ = NULL;
@@ -1463,18 +1464,18 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 				iter = _tmp8_;
 #line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_) {
-#line 1467 "ui.c"
+#line 1468 "ui.c"
 					gint i = 0;
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1471 "ui.c"
+#line 1472 "ui.c"
 					{
 						gboolean _tmp10_ = FALSE;
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp10_ = TRUE;
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1478 "ui.c"
+#line 1479 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
 							GtkListStore* _tmp13_ = NULL;
@@ -1486,7 +1487,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							gint _tmp20_ = 0;
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp10_) {
-#line 1490 "ui.c"
+#line 1491 "ui.c"
 								GtkListStore* _tmp11_ = NULL;
 								gboolean _tmp12_ = FALSE;
 #line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1497,7 +1498,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 								if (!_tmp12_) {
 #line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1501 "ui.c"
+#line 1502 "ui.c"
 								}
 							}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1520,7 +1521,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							_tmp18_ = matched;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp18_) {
-#line 1524 "ui.c"
+#line 1525 "ui.c"
 								gint _tmp19_ = 0;
 #line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp19_ = i;
@@ -1530,7 +1531,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 								_g_free0 (name);
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1534 "ui.c"
+#line 1535 "ui.c"
 							}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = i;
@@ -1538,7 +1539,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							i = _tmp20_ + 1;
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1542 "ui.c"
+#line 1543 "ui.c"
 						}
 					}
 				}
@@ -1546,7 +1547,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 				_tmp21_ = n_delete;
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ >= 0) {
-#line 1550 "ui.c"
+#line 1551 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp22_ = NULL;
 					GtkTreeIter _tmp23_ = {0};
@@ -1562,7 +1563,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 					_tmp25_ = _tmp24_->label;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp22_, &_tmp23_, 1, _tmp25_, -1, -1);
-#line 1566 "ui.c"
+#line 1567 "ui.c"
 					{
 						gboolean _tmp26_ = FALSE;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -1571,7 +1572,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 						_tmp26_ = TRUE;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1575 "ui.c"
+#line 1576 "ui.c"
 							gint _tmp28_ = 0;
 							gint _tmp29_ = 0;
 							GtkListStore* _tmp30_ = NULL;
@@ -1581,13 +1582,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							GtkTreeIter _tmp34_ = {0};
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp26_) {
-#line 1585 "ui.c"
+#line 1586 "ui.c"
 								gint _tmp27_ = 0;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp27_ = i;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								i = _tmp27_ + 1;
-#line 1591 "ui.c"
+#line 1592 "ui.c"
 							}
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = FALSE;
@@ -1599,7 +1600,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							if (!(_tmp28_ < _tmp29_)) {
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1603 "ui.c"
+#line 1604 "ui.c"
 							}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp30_ = self->priv->device_model;
@@ -1615,7 +1616,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							_tmp34_ = iter;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp33_, &_tmp34_);
-#line 1619 "ui.c"
+#line 1620 "ui.c"
 						}
 					}
 				} else {
@@ -1650,7 +1651,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 					_tmp43_ = _tmp42_->label;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp38_, &_tmp39_, 0, _tmp41_, 1, _tmp43_, -1, -1);
-#line 1654 "ui.c"
+#line 1655 "ui.c"
 				}
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = index;
@@ -1658,13 +1659,13 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 				index = _tmp44_ + 1;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1662 "ui.c"
+#line 1663 "ui.c"
 			}
 		}
 	}
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1668 "ui.c"
+#line 1669 "ui.c"
 		GtkListStore* _tmp45_ = NULL;
 		gint _tmp46_ = 0;
 		GtkTreeIter _tmp47_ = {0};
@@ -1683,7 +1684,7 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 		if (!_tmp48_) {
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1687 "ui.c"
+#line 1688 "ui.c"
 		}
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = self->priv->device_model;
@@ -1691,39 +1692,39 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 		_tmp50_ = iter;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp49_, &_tmp50_);
-#line 1695 "ui.c"
+#line 1696 "ui.c"
 	}
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = have_selection;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp52_) {
-#line 1701 "ui.c"
+#line 1702 "ui.c"
 		GList* _tmp53_ = NULL;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = devices;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = _tmp53_ != NULL;
-#line 1707 "ui.c"
+#line 1708 "ui.c"
 	} else {
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = FALSE;
-#line 1711 "ui.c"
+#line 1712 "ui.c"
 	}
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp51_) {
-#line 1715 "ui.c"
+#line 1716 "ui.c"
 		GtkComboBox* _tmp54_ = NULL;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = self->priv->device_combo;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active (_tmp54_, 0);
-#line 1721 "ui.c"
+#line 1722 "ui.c"
 	}
 #line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1727 "ui.c"
+#line 1728 "ui.c"
 }
 
 
@@ -1760,7 +1761,7 @@ static void user_interface_add_default_page (UserInterface* self) {
 	book_view_set_selected_page (_tmp6_, page);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1764 "ui.c"
+#line 1765 "ui.c"
 }
 
 
@@ -1771,35 +1772,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1789 "ui.c"
+#line 1790 "ui.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
-#line 1797 "ui.c"
+#line 1798 "ui.c"
 	} else {
-#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
-#line 1803 "ui.c"
+#line 1804 "ui.c"
 	}
 }
 
@@ -1821,105 +1822,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1226 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1230 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1837 "ui.c"
+#line 1838 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1846 "ui.c"
+#line 1847 "ui.c"
 	}
-#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1852 "ui.c"
+#line 1853 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1861 "ui.c"
+#line 1862 "ui.c"
 	}
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1867 "ui.c"
+#line 1868 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1876 "ui.c"
+#line 1877 "ui.c"
 	} else {
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1880 "ui.c"
+#line 1881 "ui.c"
 	}
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1888 "ui.c"
+#line 1889 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1897 "ui.c"
+#line 1898 "ui.c"
 	} else {
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1901 "ui.c"
+#line 1902 "ui.c"
 	}
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 1923 "ui.c"
+#line 1924 "ui.c"
 }
 
 
@@ -1974,7 +1975,7 @@ static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSel
 	_tmp8_ = extension_index;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ >= 0) {
-#line 1978 "ui.c"
+#line 1979 "ui.c"
 		const gchar* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
@@ -1988,7 +1989,7 @@ static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSel
 		_g_free0 (filename);
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp11_;
-#line 1992 "ui.c"
+#line 1993 "ui.c"
 	}
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = filename;
@@ -2012,14 +2013,14 @@ static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSel
 	_g_free0 (path);
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 2016 "ui.c"
+#line 2017 "ui.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2023 "ui.c"
+#line 2024 "ui.c"
 }
 
 
@@ -2056,7 +2057,7 @@ static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTre
 	iter = _tmp3_;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 2060 "ui.c"
+#line 2061 "ui.c"
 		GtkTreeModel* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2065,7 +2066,7 @@ static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTre
 		_tmp7_ = iter;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &extension, -1, -1);
-#line 2069 "ui.c"
+#line 2070 "ui.c"
 	}
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = extension;
@@ -2073,7 +2074,7 @@ static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTre
 	_g_object_unref0 (model);
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2077 "ui.c"
+#line 2078 "ui.c"
 }
 
 
@@ -2084,39 +2085,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2100 "ui.c"
+#line 2101 "ui.c"
 		glong _tmp4_ = 0L;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
-#line 2108 "ui.c"
+#line 2109 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
-#line 2120 "ui.c"
+#line 2121 "ui.c"
 	}
 }
 
@@ -2134,121 +2135,121 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1204 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2144 "ui.c"
+#line 2145 "ui.c"
 		glong _tmp2_ = 0L;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2150 "ui.c"
+#line 2151 "ui.c"
 	} else {
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2154 "ui.c"
+#line 2155 "ui.c"
 	}
-#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 2158 "ui.c"
+#line 2159 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 2170 "ui.c"
+#line 2171 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 2180 "ui.c"
+#line 2181 "ui.c"
 	}
-#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 2186 "ui.c"
+#line 2187 "ui.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 2200 "ui.c"
+#line 2201 "ui.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 2210 "ui.c"
+#line 2211 "ui.c"
 	}
-#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 2216 "ui.c"
+#line 2217 "ui.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 2225 "ui.c"
+#line 2226 "ui.c"
 	}
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 2245 "ui.c"
+#line 2246 "ui.c"
 }
 
 
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_file_type_changed ((UserInterface*) self, _sender);
-#line 2252 "ui.c"
+#line 2253 "ui.c"
 }
 
 
@@ -2366,18 +2367,18 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	if (_tmp3_ == NULL) {
 #line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2370 "ui.c"
+#line 2371 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 #line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
 #line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2377 "ui.c"
+#line 2378 "ui.c"
 	}
 #line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 2381 "ui.c"
+#line 2382 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2388,7 +2389,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (directory);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
-#line 2392 "ui.c"
+#line 2393 "ui.c"
 	}
 #line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
@@ -2510,7 +2511,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_tmp40_ = index;
 #line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp40_ >= 0) {
-#line 2514 "ui.c"
+#line 2515 "ui.c"
 		const gchar* _tmp41_ = NULL;
 		gint _tmp42_ = 0;
 		gchar* _tmp43_ = NULL;
@@ -2524,10 +2525,10 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (default_extension);
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		default_extension = _tmp43_;
-#line 2528 "ui.c"
+#line 2529 "ui.c"
 	}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp44_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+	_tmp44_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file_type_store = _tmp44_;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2624,14 +2625,14 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	iter = _tmp73_;
 #line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp74_) {
-#line 2628 "ui.c"
+#line 2629 "ui.c"
 		{
 			gboolean _tmp75_ = FALSE;
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp75_ = TRUE;
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 2635 "ui.c"
+#line 2636 "ui.c"
 				gchar* e = NULL;
 				GtkListStore* _tmp78_ = NULL;
 				GtkTreeIter _tmp79_ = {0};
@@ -2639,7 +2640,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 				const gchar* _tmp81_ = NULL;
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp75_) {
-#line 2643 "ui.c"
+#line 2644 "ui.c"
 					GtkListStore* _tmp76_ = NULL;
 					gboolean _tmp77_ = FALSE;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2650,7 +2651,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 					if (!_tmp77_) {
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 2654 "ui.c"
+#line 2655 "ui.c"
 					}
 				}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2667,7 +2668,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 				_tmp81_ = e;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp80_, _tmp81_) == 0) {
-#line 2671 "ui.c"
+#line 2672 "ui.c"
 					GtkTreeView* _tmp82_ = NULL;
 					GtkTreeSelection* _tmp83_ = NULL;
 					GtkTreeIter _tmp84_ = {0};
@@ -2679,11 +2680,11 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 					_tmp84_ = iter;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_tree_selection_select_iter (_tmp83_, &_tmp84_);
-#line 2683 "ui.c"
+#line 2684 "ui.c"
 				}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (e);
-#line 2687 "ui.c"
+#line 2688 "ui.c"
 			}
 		}
 	}
@@ -2709,7 +2710,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_tmp90_ = response;
 #line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp90_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2713 "ui.c"
+#line 2714 "ui.c"
 		GtkTreeSelection* selection = NULL;
 		GtkTreeView* _tmp91_ = NULL;
 		GtkTreeSelection* _tmp92_ = NULL;
@@ -2767,7 +2768,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_tmp102_ = extension_index;
 #line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp102_ < 0) {
-#line 2771 "ui.c"
+#line 2772 "ui.c"
 			const gchar* _tmp103_ = NULL;
 			const gchar* _tmp104_ = NULL;
 			gchar* _tmp105_ = NULL;
@@ -2781,7 +2782,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 			_g_free0 (path);
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			path = _tmp105_;
-#line 2785 "ui.c"
+#line 2786 "ui.c"
 		}
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp106_ = path;
@@ -2805,7 +2806,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		_g_free0 (extension);
 #line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (selection);
-#line 2809 "ui.c"
+#line 2810 "ui.c"
 	}
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp110_ = self->priv->settings;
@@ -2824,7 +2825,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = gtk_tree_view_get_selection (_tmp114_);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp116_, NULL, FALSE);
+	g_signal_parse_name ("changed", gtk_tree_selection_get_type (), &_tmp116_, NULL, FALSE);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp115_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp116_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
 #line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2853,7 +2854,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	_g_free0 (directory);
 #line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2857 "ui.c"
+#line 2858 "ui.c"
 }
 
 
@@ -2884,21 +2885,21 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_tmp1_ = self->priv->book_uri;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2888 "ui.c"
+#line 2889 "ui.c"
 		gboolean _tmp2_ = FALSE;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2894 "ui.c"
+#line 2895 "ui.c"
 	} else {
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2898 "ui.c"
+#line 2899 "ui.c"
 	}
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 2902 "ui.c"
+#line 2903 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2909,7 +2910,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
-#line 2913 "ui.c"
+#line 2914 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -2918,7 +2919,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2922 "ui.c"
+#line 2923 "ui.c"
 	}
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
@@ -2930,7 +2931,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2934 "ui.c"
+#line 2935 "ui.c"
 	}
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
@@ -2958,7 +2959,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 2962 "ui.c"
+#line 2963 "ui.c"
 		gchar* _tmp15_ = NULL;
 #line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
@@ -2966,7 +2967,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (format);
 #line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
-#line 2970 "ui.c"
+#line 2971 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
@@ -2976,7 +2977,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
 #line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
-#line 2980 "ui.c"
+#line 2981 "ui.c"
 			gchar* _tmp18_ = NULL;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
@@ -2984,7 +2985,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 			_g_free0 (format);
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
-#line 2988 "ui.c"
+#line 2989 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
@@ -2994,7 +2995,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
 #line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
-#line 2998 "ui.c"
+#line 2999 "ui.c"
 				gchar* _tmp21_ = NULL;
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
@@ -3002,7 +3003,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 				_g_free0 (format);
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
-#line 3006 "ui.c"
+#line 3007 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
@@ -3015,7 +3016,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 				if (_tmp24_) {
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
-#line 3019 "ui.c"
+#line 3020 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
@@ -3025,11 +3026,11 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
-#line 3029 "ui.c"
+#line 3030 "ui.c"
 				}
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
-#line 3033 "ui.c"
+#line 3034 "ui.c"
 					gchar* _tmp27_ = NULL;
 #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
@@ -3037,14 +3038,14 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 					_g_free0 (format);
 #line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
-#line 3041 "ui.c"
+#line 3042 "ui.c"
 				}
 			}
 		}
 	}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 3048 "ui.c"
+#line 3049 "ui.c"
 	{
 		Book* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
@@ -3064,8 +3065,8 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 3069 "ui.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3070 "ui.c"
 			goto __catch16_g_error;
 		}
 	}
@@ -3112,11 +3113,11 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		_g_free0 (uri);
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3116 "ui.c"
+#line 3117 "ui.c"
 	}
 	__finally16:
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3131,7 +3132,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		g_clear_error (&_inner_error_);
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3135 "ui.c"
+#line 3136 "ui.c"
 	}
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
@@ -3157,7 +3158,7 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	_g_free0 (uri);
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3161 "ui.c"
+#line 3162 "ui.c"
 }
 
 
@@ -3200,7 +3201,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 		result = TRUE;
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3204 "ui.c"
+#line 3205 "ui.c"
 	}
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
@@ -3250,7 +3251,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	switch (_tmp16_) {
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3254 "ui.c"
+#line 3255 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -3263,7 +3264,7 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 				_g_object_unref0 (dialog);
 #line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3267 "ui.c"
+#line 3268 "ui.c"
 			} else {
 #line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
@@ -3271,38 +3272,35 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 				_g_object_unref0 (dialog);
 #line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3275 "ui.c"
+#line 3276 "ui.c"
 			}
 		}
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case GTK_RESPONSE_CANCEL:
-#line 3280 "ui.c"
+		case GTK_RESPONSE_NO:
+#line 3281 "ui.c"
 		{
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			result = FALSE;
+			result = TRUE;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3288 "ui.c"
+#line 3289 "ui.c"
 		}
 		default:
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case GTK_RESPONSE_NO:
-#line 3293 "ui.c"
 		{
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			result = TRUE;
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			result = FALSE;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3301 "ui.c"
+#line 3299 "ui.c"
 		}
 	}
 #line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3306 "ui.c"
+#line 3304 "ui.c"
 }
 
 
@@ -3311,31 +3309,31 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	GtkMenuItem* _tmp2_ = NULL;
 	GtkMenuItem* _tmp3_ = NULL;
-#line 693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3339 "ui.c"
+#line 3337 "ui.c"
 }
 
 
@@ -3345,60 +3343,60 @@ static void user_interface_new_document (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3361 "ui.c"
+#line 3359 "ui.c"
 	}
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3371 "ui.c"
+#line 3369 "ui.c"
 	}
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3375 "ui.c"
+#line 3373 "ui.c"
 }
 
 
 static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3386 "ui.c"
+#line 3384 "ui.c"
 }
 
 
 static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3393 "ui.c"
+#line 3391 "ui.c"
 }
 
 
 void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3402 "ui.c"
+#line 3400 "ui.c"
 }
 
 
@@ -3407,78 +3405,78 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3427 "ui.c"
+#line 3425 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_button_menuitem;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_button_hb_menuitem;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->text_menuitem;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 3443 "ui.c"
+#line 3441 "ui.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = document_hint;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp6_, "photo") == 0) {
-#line 3450 "ui.c"
+#line 3448 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_button_menuitem;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->photo_button_hb_menuitem;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = self->priv->photo_menuitem;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 3466 "ui.c"
+#line 3464 "ui.c"
 		}
 	}
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = save;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp10_) {
-#line 3473 "ui.c"
+#line 3471 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->settings;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = document_hint;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3482 "ui.c"
+#line 3480 "ui.c"
 	}
 }
 
@@ -3487,21 +3485,21 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3505 "ui.c"
+#line 3503 "ui.c"
 	}
 }
 
@@ -3509,7 +3507,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3513 "ui.c"
+#line 3511 "ui.c"
 }
 
 
@@ -3517,21 +3515,21 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3535 "ui.c"
+#line 3533 "ui.c"
 	}
 }
 
@@ -3539,7 +3537,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3543 "ui.c"
+#line 3541 "ui.c"
 }
 
 
@@ -3548,71 +3546,71 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3562 "ui.c"
+#line 3560 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3569 "ui.c"
+#line 3567 "ui.c"
 				gint s = 0;
 				GtkListStore* _tmp6_ = NULL;
 				GtkTreeIter _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				ScanType _tmp9_ = 0;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 3577 "ui.c"
+#line 3575 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp4_ = self->priv->page_side_model;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3588 "ui.c"
+#line 3586 "ui.c"
 					}
 				}
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = self->priv->page_side_model;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = iter;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = s;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = page_side;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3605 "ui.c"
+#line 3603 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = self->priv->page_side_combo;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = iter;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3616 "ui.c"
+#line 3614 "ui.c"
 				}
 			}
 		}
@@ -3625,27 +3623,27 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean have_iter = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp18_ = FALSE;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3631 "ui.c"
+#line 3629 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3649 "ui.c"
+#line 3647 "ui.c"
 			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
@@ -3654,96 +3652,96 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gboolean _tmp9_ = FALSE;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
-#line 3660 "ui.c"
+#line 3658 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = self->priv->paper_size_model;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
-#line 3669 "ui.c"
+#line 3667 "ui.c"
 			}
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = have_iter;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp6_) {
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3679 "ui.c"
+#line 3677 "ui.c"
 			}
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = iter;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = w;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = width;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 3693 "ui.c"
+#line 3691 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = h;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = height;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3702 "ui.c"
+#line 3700 "ui.c"
 			} else {
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
-#line 3706 "ui.c"
+#line 3704 "ui.c"
 			}
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp9_) {
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3712 "ui.c"
+#line 3710 "ui.c"
 			}
 		}
 	}
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = have_iter;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
-#line 3720 "ui.c"
+#line 3718 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->paper_size_model;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp16_;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
-#line 3732 "ui.c"
+#line 3730 "ui.c"
 	}
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = have_iter;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp18_) {
-#line 3738 "ui.c"
+#line 3736 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = self->priv->paper_size_combo;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = iter;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3747 "ui.c"
+#line 3745 "ui.c"
 	}
 }
 
@@ -3755,34 +3753,34 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3771 "ui.c"
+#line 3769 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3780 "ui.c"
+#line 3778 "ui.c"
 	}
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3786 "ui.c"
+#line 3784 "ui.c"
 }
 
 
@@ -3793,34 +3791,34 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3809 "ui.c"
+#line 3807 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3818 "ui.c"
+#line 3816 "ui.c"
 	}
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3824 "ui.c"
+#line 3822 "ui.c"
 }
 
 
@@ -3832,36 +3830,36 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_ = 0;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3848 "ui.c"
+#line 3846 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3857 "ui.c"
+#line 3855 "ui.c"
 	}
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3865 "ui.c"
+#line 3863 "ui.c"
 }
 
 
@@ -3874,66 +3872,66 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3894 "ui.c"
+#line 3892 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3909 "ui.c"
+#line 3907 "ui.c"
 		}
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3915 "ui.c"
+#line 3913 "ui.c"
 		}
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3919 "ui.c"
+#line 3917 "ui.c"
 	}
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3927 "ui.c"
+#line 3925 "ui.c"
 	}
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3933 "ui.c"
+#line 3931 "ui.c"
 	}
-#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3937 "ui.c"
+#line 3935 "ui.c"
 }
 
 
@@ -3952,88 +3950,88 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3966 "ui.c"
+#line 3964 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_ = NULL;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3985 "ui.c"
+#line 3983 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_ = NULL;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 4005 "ui.c"
+#line 4003 "ui.c"
 	}
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _tmp15_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_->brightness = _tmp16_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = options;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_get_contrast (self);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _tmp18_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_->contrast = _tmp19_;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4037 "ui.c"
+#line 4035 "ui.c"
 }
 
 
@@ -4043,73 +4041,73 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_make_scan_options (self);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 4069 "ui.c"
+#line 4067 "ui.c"
 }
 
 
 static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4076 "ui.c"
+#line 4074 "ui.c"
 }
 
 
 static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 4087 "ui.c"
+#line 4085 "ui.c"
 }
 
 
 static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4094 "ui.c"
+#line 4092 "ui.c"
 }
 
 
 static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scanning (self);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 4113 "ui.c"
+#line 4111 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -4119,31 +4117,31 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		ScanOptions* _tmp8_ = NULL;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = user_interface_make_scan_options (self);
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		options = _tmp2_;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_page_side (self);
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->type = _tmp4_;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_selected_device (self);
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = options;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 4147 "ui.c"
+#line 4145 "ui.c"
 	}
 }
 
@@ -4151,56 +4149,56 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_continuous_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4155 "ui.c"
+#line 4153 "ui.c"
 }
 
 
 static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	GtkDialog* _tmp0_ = NULL;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4169 "ui.c"
+#line 4167 "ui.c"
 }
 
 
 static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4176 "ui.c"
+#line 4174 "ui.c"
 }
 
 
 void user_interface_preferences_activate_cb (UserInterface* self) {
 	GtkDialog* _tmp0_ = NULL;
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4188 "ui.c"
+#line 4186 "ui.c"
 }
 
 
 static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
-#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4204 "ui.c"
+#line 4202 "ui.c"
 }
 
 
@@ -4209,35 +4207,35 @@ static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_de
 	result = user_interface_preferences_dialog_delete_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4213 "ui.c"
+#line 4211 "ui.c"
 }
 
 
 static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
 	GtkDialog* _tmp0_ = NULL;
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4227 "ui.c"
+#line 4225 "ui.c"
 }
 
 
 static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id);
-#line 4234 "ui.c"
+#line 4232 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
-#line 4241 "ui.c"
+#line 4239 "ui.c"
 }
 
 
@@ -4248,34 +4246,34 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4268 "ui.c"
+#line 4266 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4279 "ui.c"
+#line 4277 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4288,37 +4286,37 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		Book* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->_book;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = page;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		index = _tmp9_;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = index;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = _tmp15_;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4318 "ui.c"
+#line 4316 "ui.c"
 	}
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4322 "ui.c"
+#line 4320 "ui.c"
 }
 
 
@@ -4339,165 +4337,165 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	Page* _tmp37_ = NULL;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4353 "ui.c"
+#line 4351 "ui.c"
 	}
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->no_crop_menuitem;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menuitem = _tmp2_;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_has_crop (_tmp3_);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 4373 "ui.c"
+#line 4371 "ui.c"
 		gchar* crop_name = NULL;
 		Page* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page_get_crop_name (_tmp6_);
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		crop_name = _tmp9_;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
-#line 4394 "ui.c"
+#line 4392 "ui.c"
 			const gchar* _tmp11_ = NULL;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = crop_name;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp11_, "A4") == 0) {
-#line 4400 "ui.c"
+#line 4398 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = self->priv->a4_menuitem;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (menuitem);
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
-#line 4411 "ui.c"
+#line 4409 "ui.c"
 			} else {
 				const gchar* _tmp14_ = NULL;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = crop_name;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp14_, "A5") == 0) {
-#line 4418 "ui.c"
+#line 4416 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = self->priv->a5_menuitem;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (menuitem);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
-#line 4429 "ui.c"
+#line 4427 "ui.c"
 				} else {
 					const gchar* _tmp17_ = NULL;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp17_ = crop_name;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp17_, "A6") == 0) {
-#line 4436 "ui.c"
+#line 4434 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = self->priv->a6_menuitem;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_object_unref0 (menuitem);
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
-#line 4447 "ui.c"
+#line 4445 "ui.c"
 					} else {
 						const gchar* _tmp20_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = crop_name;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp20_, "letter") == 0) {
-#line 4454 "ui.c"
+#line 4452 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = self->priv->letter_menuitem;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_object_unref0 (menuitem);
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
-#line 4465 "ui.c"
+#line 4463 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = crop_name;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp23_, "legal") == 0) {
-#line 4472 "ui.c"
+#line 4470 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp24_ = self->priv->legal_menuitem;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_object_unref0 (menuitem);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
-#line 4483 "ui.c"
+#line 4481 "ui.c"
 							} else {
 								const gchar* _tmp26_ = NULL;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp26_ = crop_name;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
-#line 4490 "ui.c"
+#line 4488 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp27_ = self->priv->four_by_six_menuitem;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_g_object_unref0 (menuitem);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
-#line 4501 "ui.c"
+#line 4499 "ui.c"
 								}
 							}
 						}
@@ -4507,49 +4505,49 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		} else {
 			GtkRadioMenuItem* _tmp29_ = NULL;
 			GtkRadioMenuItem* _tmp30_ = NULL;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp29_ = self->priv->custom_crop_menuitem;
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp30_ = _g_object_ref0 (_tmp29_);
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (menuitem);
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
-#line 4519 "ui.c"
+#line 4517 "ui.c"
 		}
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4523 "ui.c"
+#line 4521 "ui.c"
 	}
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = self->priv->crop_button;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = page;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = page_get_has_crop (_tmp33_);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _tmp34_;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = self->priv->crop_toolbutton;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = page;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = page_get_has_crop (_tmp37_);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = _tmp38_;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4553 "ui.c"
+#line 4551 "ui.c"
 }
 
 
@@ -4561,51 +4559,51 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4583 "ui.c"
+#line 4581 "ui.c"
 	}
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4591 "ui.c"
+#line 4589 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = file;
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 4609 "ui.c"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4607 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -4616,42 +4614,42 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _ ("Unable to save image for preview");
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = e;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_->message;
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4640 "ui.c"
+#line 4638 "ui.c"
 	}
 	__finally17:
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4655 "ui.c"
+#line 4653 "ui.c"
 	}
 	{
 		GdkScreen* _tmp11_ = NULL;
@@ -4660,25 +4658,25 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		guint32 _tmp16_ = 0U;
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = _tmp11_;
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = file;
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = _tmp14_;
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_get_current_event_time ();
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp15_);
-#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 4682 "ui.c"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4680 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4689,59 +4687,59 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = _ ("Unable to open image preview application");
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = e;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4707 "ui.c"
+#line 4705 "ui.c"
 	}
 	__finally18:
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4722 "ui.c"
+#line 4720 "ui.c"
 	}
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4728 "ui.c"
+#line 4726 "ui.c"
 }
 
 
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
 	GtkMenu* _tmp0_ = NULL;
 	guint32 _tmp1_ = 0U;
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_menu;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_get_current_event_time ();
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
-#line 4745 "ui.c"
+#line 4743 "ui.c"
 }
 
 
@@ -4753,50 +4751,50 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4767 "ui.c"
+#line 4765 "ui.c"
 	}
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4783 "ui.c"
+#line 4781 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
-#line 4789 "ui.c"
+#line 4787 "ui.c"
 	}
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4793 "ui.c"
+#line 4791 "ui.c"
 }
 
 
 static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4800 "ui.c"
+#line 4798 "ui.c"
 }
 
 
@@ -4808,50 +4806,50 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/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 1022 "/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 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4822 "ui.c"
+#line 4820 "ui.c"
 	}
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4838 "ui.c"
+#line 4836 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
-#line 4844 "ui.c"
+#line 4842 "ui.c"
 	}
-#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4848 "ui.c"
+#line 4846 "ui.c"
 }
 
 
 static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4855 "ui.c"
+#line 4853 "ui.c"
 }
 
 
@@ -4866,62 +4864,62 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1031 "/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 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4884 "ui.c"
+#line 4882 "ui.c"
 	}
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _page_ref0 (_tmp5_);
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp6_;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1041: Trying to set crop but no selected page");
 #line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1042: Trying to set crop but no selected page");
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4906 "ui.c"
+#line 4904 "ui.c"
 	}
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
-#line 4912 "ui.c"
+#line 4910 "ui.c"
 		Page* _tmp9_ = NULL;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
-#line 4918 "ui.c"
+#line 4916 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4925 "ui.c"
+#line 4923 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4942,66 +4940,66 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp24_ = 0;
 			gint _tmp25_ = 0;
 			gint _tmp26_ = 0;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_width (_tmp11_);
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = _tmp12_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			width = _tmp13_;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = page;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page_get_height (_tmp14_);
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = _tmp15_;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			height = _tmp16_;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = width;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = height;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = page;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = crop_height;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = page;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = width;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_width;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = height;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = crop_height;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4990 "ui.c"
+#line 4988 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp27_ = page;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp28_ = crop_name;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 5000 "ui.c"
+#line 4998 "ui.c"
 		}
 	}
-#line 1032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5005 "ui.c"
+#line 5003 "ui.c"
 }
 
 
@@ -5009,21 +5007,21 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1062 "/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 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 5027 "ui.c"
+#line 5025 "ui.c"
 	}
 }
 
@@ -5031,7 +5029,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5035 "ui.c"
+#line 5033 "ui.c"
 }
 
 
@@ -5039,21 +5037,21 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 5057 "ui.c"
+#line 5055 "ui.c"
 	}
 }
 
@@ -5061,7 +5059,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5065 "ui.c"
+#line 5063 "ui.c"
 }
 
 
@@ -5070,40 +5068,40 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	GtkToggleButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5084 "ui.c"
+#line 5082 "ui.c"
 	}
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5094 "ui.c"
+#line 5092 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5100 "ui.c"
+#line 5098 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5107 "ui.c"
+#line 5105 "ui.c"
 	}
 }
 
@@ -5111,7 +5109,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender);
-#line 5115 "ui.c"
+#line 5113 "ui.c"
 }
 
 
@@ -5120,40 +5118,40 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5134 "ui.c"
+#line 5132 "ui.c"
 	}
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5144 "ui.c"
+#line 5142 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5150 "ui.c"
+#line 5148 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5157 "ui.c"
+#line 5155 "ui.c"
 	}
 }
 
@@ -5161,7 +5159,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender);
-#line 5165 "ui.c"
+#line 5163 "ui.c"
 }
 
 
@@ -5169,21 +5167,21 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 5187 "ui.c"
+#line 5185 "ui.c"
 	}
 }
 
@@ -5191,7 +5189,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5195 "ui.c"
+#line 5193 "ui.c"
 }
 
 
@@ -5199,21 +5197,21 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 5217 "ui.c"
+#line 5215 "ui.c"
 	}
 }
 
@@ -5221,7 +5219,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5225 "ui.c"
+#line 5223 "ui.c"
 }
 
 
@@ -5229,21 +5227,21 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 5247 "ui.c"
+#line 5245 "ui.c"
 	}
 }
 
@@ -5251,7 +5249,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5255 "ui.c"
+#line 5253 "ui.c"
 }
 
 
@@ -5259,21 +5257,21 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 5277 "ui.c"
+#line 5275 "ui.c"
 	}
 }
 
@@ -5281,7 +5279,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5285 "ui.c"
+#line 5283 "ui.c"
 }
 
 
@@ -5289,21 +5287,21 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5307 "ui.c"
+#line 5305 "ui.c"
 	}
 }
 
@@ -5311,7 +5309,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5315 "ui.c"
+#line 5313 "ui.c"
 }
 
 
@@ -5319,21 +5317,21 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5337 "ui.c"
+#line 5335 "ui.c"
 	}
 }
 
@@ -5341,7 +5339,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5345 "ui.c"
+#line 5343 "ui.c"
 }
 
 
@@ -5353,44 +5351,44 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5379 "ui.c"
+#line 5377 "ui.c"
 	}
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp5_);
-#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5387 "ui.c"
+#line 5385 "ui.c"
 }
 
 
 static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5394 "ui.c"
+#line 5392 "ui.c"
 }
 
 
@@ -5405,56 +5403,56 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	Page* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5435 "ui.c"
+#line 5433 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->_book;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = index;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5447 "ui.c"
+#line 5445 "ui.c"
 	}
-#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5451 "ui.c"
+#line 5449 "ui.c"
 }
 
 
 static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5458 "ui.c"
+#line 5456 "ui.c"
 }
 
 
@@ -5472,68 +5470,68 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	Book* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 	guint _tmp10_ = 0U;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/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"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->_book;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _tmp9_;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5508 "ui.c"
+#line 5506 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
 		Page* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->_book;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = page;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = self->priv->_book;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = page;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5526 "ui.c"
+#line 5524 "ui.c"
 	}
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5530 "ui.c"
+#line 5528 "ui.c"
 }
 
 
 static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5537 "ui.c"
+#line 5535 "ui.c"
 }
 
 
@@ -5544,202 +5542,202 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5566 "ui.c"
+#line 5564 "ui.c"
 }
 
 
 static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5573 "ui.c"
+#line 5571 "ui.c"
 }
 
 
 static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data1_;
-#line 5582 "ui.c"
+#line 5580 "ui.c"
 }
 
 
 static void block1_data_unref (void * _userdata_) {
 	Block1Data* _data1_;
 	_data1_ = (Block1Data*) _userdata_;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 5591 "ui.c"
+#line 5589 "ui.c"
 		UserInterface* self;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data1_->self;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data1_->dialog);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 5601 "ui.c"
+#line 5599 "ui.c"
 	}
 }
 
 
-static gboolean __lambda4_ (Block1Data* _data1_, GdkEventKey* e) {
+static gboolean __lambda5_ (Block1Data* _data1_, GdkEventKey* e) {
 	UserInterface* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	GdkEventKey* _tmp1_ = NULL;
 	GdkModifierType _tmp2_ = 0;
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = e;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_->state;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
-#line 5622 "ui.c"
+#line 5620 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = e;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->keyval;
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5631 "ui.c"
+#line 5629 "ui.c"
 	} else {
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 5635 "ui.c"
+#line 5633 "ui.c"
 	}
-#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5645 "ui.c"
+#line 5643 "ui.c"
 	}
-#line 1191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5651 "ui.c"
+#line 5649 "ui.c"
 }
 
 
-static gboolean ___lambda4__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
+static gboolean ___lambda5__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
-	result = __lambda4_ (self, event);
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = __lambda5_ (self, event);
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5660 "ui.c"
+#line 5658 "ui.c"
 }
 
 
-static void __lambda5_ (Block1Data* _data1_) {
+static void __lambda6_ (Block1Data* _data1_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides (_tmp0_);
-#line 1208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5675 "ui.c"
+#line 5673 "ui.c"
 }
 
 
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda5_ (self);
-#line 5682 "ui.c"
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda6_ (self);
+#line 5680 "ui.c"
 }
 
 
-static void __lambda6_ (Block1Data* _data1_) {
+static void __lambda7_ (Block1Data* _data1_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides_reverse (_tmp0_);
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5697 "ui.c"
+#line 5695 "ui.c"
 }
 
 
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda6_ (self);
-#line 5704 "ui.c"
+static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda7_ (self);
+#line 5702 "ui.c"
 }
 
 
-static void __lambda7_ (Block1Data* _data1_) {
+static void __lambda8_ (Block1Data* _data1_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_reverse (_tmp0_);
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5719 "ui.c"
+#line 5717 "ui.c"
 }
 
 
-static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda7_ (self);
-#line 5726 "ui.c"
+static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda8_ (self);
+#line 5724 "ui.c"
 }
 
 
-static void __lambda8_ (Block1Data* _data1_) {
+static void __lambda9_ (Block1Data* _data1_) {
 	UserInterface* self;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5736 "ui.c"
+#line 5734 "ui.c"
 }
 
 
-static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda8_ (self);
-#line 5743 "ui.c"
+static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda9_ (self);
+#line 5741 "ui.c"
 }
 
 
@@ -5770,170 +5768,170 @@ static void user_interface_reorder_document (UserInterface* self) {
 	GtkButton* _tmp20_ = NULL;
 	GtkButton* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = g_slice_new0 (Block1Data);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->_ref_count_ = 1;
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->self = g_object_ref (self);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->dialog = _tmp0_;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_type_hint (_data1_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal (_data1_->dialog, TRUE);
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _data1_->dialog, (guint) 12);
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Reorder Pages");
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title (_data1_->dialog, _tmp1_);
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for (_data1_->dialog, (GtkWindow*) self);
-#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data ((GtkWidget*) _data1_->dialog, "key-press-event", (GCallback) ___lambda4__gtk_widget_key_press_event, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data ((GtkWidget*) _data1_->dialog, "key-press-event", (GCallback) ___lambda5__gtk_widget_key_press_event, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _data1_->dialog, TRUE);
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkGrid*) gtk_grid_new ();
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g = _tmp2_;
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_homogeneous (g, TRUE);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_spacing (g, 6);
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_homogeneous (g, TRUE);
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_spacing (g, 6);
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _data1_->dialog, (GtkWidget*) g);
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _ ("Combine sides");
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp4_;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = b;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda5__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda6__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = b;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = b;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Combine sides (reverse)");
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp9_;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = b;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda6__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = b;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = b;
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _ ("Reverse");
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp14_;
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = b;
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = b;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = b;
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = _ ("Keep unchanged");
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp19_;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = b;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda9__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = b;
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = b;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present (_data1_->dialog);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (g);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block1_data_unref (_data1_);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = NULL;
-#line 5910 "ui.c"
+#line 5908 "ui.c"
 }
 
 
 void user_interface_reorder_document_activate_cb (UserInterface* self) {
-#line 1245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1244 "/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 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5919 "ui.c"
+#line 5917 "ui.c"
 }
 
 
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5930 "ui.c"
+#line 5928 "ui.c"
 }
 
 
 static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5937 "ui.c"
+#line 5935 "ui.c"
 }
 
 
@@ -5949,61 +5947,61 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	GtkBox* rb = NULL;
 	const gchar* _tmp4_ = NULL;
 	GtkBox* _tmp5_ = NULL;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp0_;
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp1_;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = text;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp3_;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = items;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	rb = _tmp5_;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = b;
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (rb);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6007 "ui.c"
+#line 6005 "ui.c"
 }
 
 
@@ -6011,17 +6009,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 996 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 6025 "ui.c"
+#line 6023 "ui.c"
 }
 
 
@@ -6031,35 +6029,35 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkBox* page_box = NULL;
-#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	box = _tmp0_;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = box;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
-#line 6051 "ui.c"
+#line 6049 "ui.c"
 	{
 		gint i = 0;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
-#line 6056 "ui.c"
+#line 6054 "ui.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = TRUE;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 6063 "ui.c"
+#line 6061 "ui.c"
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				gchar _tmp6_ = '\0';
@@ -6099,164 +6097,164 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp49_ = NULL;
 				GtkBox* _tmp50_ = NULL;
 				PageIcon* _tmp51_ = NULL;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
-#line 6105 "ui.c"
+#line 6103 "ui.c"
 					gint _tmp3_ = 0;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp3_ = i;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = _tmp3_ + 1;
-#line 6111 "ui.c"
+#line 6109 "ui.c"
 				}
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = items;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = i;
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_tmp6_ != '\0')) {
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6125 "ui.c"
+#line 6123 "ui.c"
 				}
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = i;
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
-#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
-#line 6135 "ui.c"
+#line 6133 "ui.c"
 					GtkArrow* a = NULL;
 					GtkArrow* _tmp10_ = NULL;
 					GtkArrow* _tmp11_ = NULL;
 					GtkBox* _tmp12_ = NULL;
 					GtkArrow* _tmp13_ = NULL;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp10_);
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					a = _tmp10_;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = a;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = box;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = a;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = NULL;
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (a);
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
-#line 6165 "ui.c"
+#line 6163 "ui.c"
 				}
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = i;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				side = _tmp16_;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = i;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				i = _tmp17_ + 1;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = items;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = i;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp20_ == '\0') {
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6189 "ui.c"
+#line 6187 "ui.c"
 				}
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = page_box;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ == NULL) {
-#line 6195 "ui.c"
+#line 6193 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
 					GtkBox* _tmp25_ = NULL;
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp22_);
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = _tmp22_;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = page_box;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = box;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = page_box;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 6218 "ui.c"
+#line 6216 "ui.c"
 				}
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = 1.0;
-#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = 1.0;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = 1.0;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = side;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				switch (_tmp26_) {
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
-#line 6232 "ui.c"
+#line 6230 "ui.c"
 					{
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0x75 / 255.0;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x50 / 255.0;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0x7B / 255.0;
-#line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6242 "ui.c"
+#line 6240 "ui.c"
 					}
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
-#line 6246 "ui.c"
+#line 6244 "ui.c"
 					{
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0xF5 / 255.0;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x79 / 255.0;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0.0;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6256 "ui.c"
+#line 6254 "ui.c"
 					}
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
-#line 6260 "ui.c"
+#line 6258 "ui.c"
 					{
 						gdouble p = 0.0;
 						const gchar* _tmp27_ = NULL;
@@ -6265,129 +6263,129 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						gdouble _tmp30_ = 0.0;
 						gdouble _tmp31_ = 0.0;
 						gdouble _tmp32_ = 0.0;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp27_ = items;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp28_ = i;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						p = (_tmp29_ - '1') / 5.0;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp30_ = p;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp31_ = p;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp32_ = p;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = (0xD4 / 255.0) * (1 - _tmp32_);
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = (gdouble) 0;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6291 "ui.c"
+#line 6289 "ui.c"
 					}
 					default:
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6296 "ui.c"
+#line 6294 "ui.c"
 				}
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = r;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp35_ = g;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp36_ = g;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp37_ = b;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp38_ = b;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp39_ = items;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp40_ = i;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp43_ = _tmp42_;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = r;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = g;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = b;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g_object_ref_sink (_tmp47_);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp48_ = _tmp47_;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_tmp43_);
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				icon = _tmp48_;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp49_ = icon;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp50_ = page_box;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp51_ = icon;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (icon);
-#line 6354 "ui.c"
+#line 6352 "ui.c"
 			}
 		}
 	}
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = box;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (page_box);
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6364 "ui.c"
+#line 6362 "ui.c"
 }
 
 
 static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6375 "ui.c"
+#line 6373 "ui.c"
 }
 
 
 static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6382 "ui.c"
+#line 6380 "ui.c"
 }
 
 
 void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6391 "ui.c"
+#line 6389 "ui.c"
 }
 
 
@@ -6398,76 +6396,76 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 6420 "ui.c"
+#line 6418 "ui.c"
 		Page* _tmp5_ = NULL;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
-#line 6426 "ui.c"
+#line 6424 "ui.c"
 	}
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 6430 "ui.c"
+#line 6428 "ui.c"
 }
 
 
 static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6437 "ui.c"
+#line 6435 "ui.c"
 }
 
 
 static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6448 "ui.c"
+#line 6446 "ui.c"
 }
 
 
 static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6455 "ui.c"
+#line 6453 "ui.c"
 }
 
 
 void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6464 "ui.c"
+#line 6462 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6471 "ui.c"
+#line 6469 "ui.c"
 }
 
 
@@ -6505,118 +6503,118 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* _tmp30_ = NULL;
 	cairo_t* _tmp31_ = NULL;
 	cairo_t* _tmp32_ = NULL;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 6545 "ui.c"
+#line 6543 "ui.c"
 	}
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _tmp11_;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = is_landscape;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 6557 "ui.c"
+#line 6555 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		cairo_t* _tmp17_ = NULL;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = context;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = print_context;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = context;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 6574 "ui.c"
+#line 6572 "ui.c"
 	}
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = print_context;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _tmp22_;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = print_context;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = _tmp27_;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	image = _tmp30_;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = context;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = context;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp32_);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 6620 "ui.c"
+#line 6618 "ui.c"
 }
 
 
@@ -6624,26 +6622,26 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6640 "ui.c"
+#line 6638 "ui.c"
 }
 
 
 static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6647 "ui.c"
+#line 6645 "ui.c"
 }
 
 
@@ -6651,24 +6649,24 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6665 "ui.c"
+#line 6663 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
-#line 6672 "ui.c"
+#line 6670 "ui.c"
 }
 
 
@@ -6680,29 +6678,29 @@ static void user_interface_print_document (UserInterface* self) {
 	guint _tmp3_ = 0U;
 	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self, 0);
-#line 6700 "ui.c"
+#line 6698 "ui.c"
 	{
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) self, &_inner_error_);
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 6706 "ui.c"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6704 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -6712,90 +6710,90 @@ static void user_interface_print_document (UserInterface* self) {
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1423: Error printing: %s", _tmp5_);
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1422: Error printing: %s", _tmp5_);
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6728 "ui.c"
+#line 6726 "ui.c"
 	}
 	__finally19:
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6741 "ui.c"
+#line 6739 "ui.c"
 	}
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("draw-page", GTK_TYPE_PRINT_OPERATION, &_tmp6_, NULL, FALSE);
-#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE);
+#line 1425 "/home/bob/bzr/simple-scan/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 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 6749 "ui.c"
+#line 6747 "ui.c"
 }
 
 
 static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6760 "ui.c"
+#line 6758 "ui.c"
 }
 
 
 static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6767 "ui.c"
+#line 6765 "ui.c"
 }
 
 
 void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6776 "ui.c"
+#line 6774 "ui.c"
 }
 
 
 static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
-#line 1440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 6784 "ui.c"
+#line 6782 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = _tmp0_;
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 6799 "ui.c"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6797 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -6806,60 +6804,60 @@ static void user_interface_launch_help (UserInterface* self) {
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6824 "ui.c"
+#line 6822 "ui.c"
 	}
 	__finally20:
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1441 "/home/bob/bzr/simple-scan/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 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6835 "ui.c"
+#line 6833 "ui.c"
 	}
 }
 
 
 static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6847 "ui.c"
+#line 6845 "ui.c"
 }
 
 
 static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6854 "ui.c"
+#line 6852 "ui.c"
 }
 
 
 void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6863 "ui.c"
+#line 6861 "ui.c"
 }
 
 
@@ -6879,21 +6877,21 @@ static void user_interface_show_about (UserInterface* self) {
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -6906,62 +6904,62 @@ static void user_interface_show_about (UserInterface* self) {
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("translator-credits");
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 6927 "ui.c"
+#line 6925 "ui.c"
 }
 
 
 static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6938 "ui.c"
+#line 6936 "ui.c"
 }
 
 
 static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6945 "ui.c"
+#line 6943 "ui.c"
 }
 
 
 void user_interface_about_activate_cb (UserInterface* self) {
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6954 "ui.c"
+#line 6952 "ui.c"
 }
 
 
@@ -6972,110 +6970,110 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_ = 0U;
 	AutosaveManager* _tmp4_ = NULL;
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 6979 "ui.c"
+#line 6977 "ui.c"
 	}
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->save_state_timeout;
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 6989 "ui.c"
+#line 6987 "ui.c"
 	}
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_cleanup (_tmp4_);
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6999 "ui.c"
+#line 6997 "ui.c"
 }
 
 
 static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 7010 "ui.c"
+#line 7008 "ui.c"
 }
 
 
 static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 7017 "ui.c"
+#line 7015 "ui.c"
 }
 
 
 void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 7026 "ui.c"
+#line 7024 "ui.c"
 }
 
 
 static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 7043 "ui.c"
+#line 7041 "ui.c"
 		GdkEventConfigure* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		GdkEventConfigure* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = event;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = _tmp1_->width;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = event;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->height;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 7062 "ui.c"
+#line 7060 "ui.c"
 	}
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7068 "ui.c"
+#line 7066 "ui.c"
 }
 
 
@@ -7084,46 +7082,46 @@ static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget
 	result = user_interface_simple_scan_window_configure_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7077 "ui.c"
+#line 7075 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_ = 0;
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == 1) {
-#line 7091 "ui.c"
+#line 7089 "ui.c"
 		GtkComboBox* _tmp1_ = NULL;
 		GtkDialog* _tmp2_ = NULL;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->preferences_dialog;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_present ((GtkWindow*) _tmp2_);
-#line 7102 "ui.c"
+#line 7100 "ui.c"
 	} else {
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->have_error = FALSE;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_title);
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_title = NULL;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_text);
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_text = NULL;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_update_info_bar (self);
-#line 7116 "ui.c"
+#line 7114 "ui.c"
 	}
 }
 
@@ -7132,36 +7130,36 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt
 	gboolean result = FALSE;
 	GdkEventWindowState* _tmp0_ = NULL;
 	GdkWindowState _tmp1_ = 0;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = event;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_->changed_mask;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 7137 "ui.c"
+#line 7135 "ui.c"
 		GdkEventWindowState* _tmp2_ = NULL;
 		GdkWindowState _tmp3_ = 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = event;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_->new_window_state;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 7148 "ui.c"
+#line 7146 "ui.c"
 	}
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7154 "ui.c"
+#line 7152 "ui.c"
 }
 
 
@@ -7170,26 +7168,26 @@ static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_wid
 	result = user_interface_simple_scan_window_window_state_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7163 "ui.c"
+#line 7161 "ui.c"
 }
 
 
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7182 "ui.c"
+#line 7180 "ui.c"
 }
 
 
@@ -7198,7 +7196,7 @@ static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (
 	result = user_interface_window_delete_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7191 "ui.c"
+#line 7189 "ui.c"
 }
 
 
@@ -7212,37 +7210,37 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 7235 "ui.c"
+#line 7233 "ui.c"
 }
 
 
@@ -7250,35 +7248,35 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 7257 "ui.c"
+#line 7255 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
-#line 7264 "ui.c"
+#line 7262 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
-#line 7271 "ui.c"
+#line 7269 "ui.c"
 }
 
 
@@ -7289,46 +7287,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp3_;
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self, 0);
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0);
-#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 7310 "ui.c"
+#line 7308 "ui.c"
 }
 
 
 static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 7321 "ui.c"
+#line 7319 "ui.c"
 }
 
 
@@ -7340,39 +7338,39 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 1)) {
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 7361 "ui.c"
+#line 7359 "ui.c"
 	}
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 7365 "ui.c"
+#line 7363 "ui.c"
 }
 
 
@@ -7394,79 +7392,79 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	gint _scan_resolutions_size_ = 0;
 	gint* _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, GTK_TYPE_LIST_STORE) ? ((GtkListStore*) _tmp7_) : NULL);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_list_store_get_type ()) ? ((GtkListStore*) _tmp7_) : NULL);
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp8_;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_new0 (gint, 6);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[0] = 75;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[1] = 150;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[2] = 300;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[3] = 600;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[4] = 1200;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[5] = 2400;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp9_;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = scan_resolutions;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
-#line 7443 "ui.c"
+#line 7441 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp10_;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp10__length1;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
-#line 7455 "ui.c"
+#line 7453 "ui.c"
 			gint dpi = 0;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 7459 "ui.c"
+#line 7457 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp11_ = 0;
@@ -7480,133 +7478,133 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = dpi;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = default_dpi;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
-#line 7479 "ui.c"
+#line 7477 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = _ ("%d dpi (default)");
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = dpi;
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
-#line 7493 "ui.c"
+#line 7491 "ui.c"
 				} else {
 					gint _tmp16_ = 0;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = dpi;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp16_ == 75) {
-#line 7500 "ui.c"
+#line 7498 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = _ ("%d dpi (draft)");
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = dpi;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
-#line 7514 "ui.c"
+#line 7512 "ui.c"
 					} else {
 						gint _tmp20_ = 0;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = dpi;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp20_ == 1200) {
-#line 7521 "ui.c"
+#line 7519 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = dpi;
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
-#line 7535 "ui.c"
+#line 7533 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
 							gchar* _tmp26_ = NULL;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = _ ("%d dpi");
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = dpi;
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
-#line 7550 "ui.c"
+#line 7548 "ui.c"
 						}
 					}
 				}
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp27_ = model;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp28_;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = model;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = iter;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = dpi;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = label;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = dpi;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = current_dpi;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 7576 "ui.c"
+#line 7574 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = combo;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = iter;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 7585 "ui.c"
+#line 7583 "ui.c"
 				}
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 7589 "ui.c"
+#line 7587 "ui.c"
 			}
 		}
 	}
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 7599 "ui.c"
+#line 7597 "ui.c"
 }
 
 
@@ -7627,257 +7625,257 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GtkMenuItem* _tmp16_ = NULL;
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->save_button;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->save_toolbutton;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = _tmp13_;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 7662 "ui.c"
+#line 7660 "ui.c"
 		GtkMenuItem* _tmp15_ = NULL;
-#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->save_as_menuitem;
-#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
-#line 7668 "ui.c"
+#line 7666 "ui.c"
 	}
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
-#line 7674 "ui.c"
+#line 7672 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
-#line 7681 "ui.c"
+#line 7679 "ui.c"
 }
 
 
-static void __lambda10_ (UserInterface* self) {
+static void __lambda11_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 7694 "ui.c"
+#line 7692 "ui.c"
 }
 
 
-static void ___lambda10__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda10_ ((UserInterface*) self);
-#line 7701 "ui.c"
+static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda11_ ((UserInterface*) self);
+#line 7699 "ui.c"
 }
 
 
-static void __lambda11_ (UserInterface* self) {
+static void __lambda12_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 7714 "ui.c"
+#line 7712 "ui.c"
 }
 
 
-static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda11_ ((UserInterface*) self);
-#line 7721 "ui.c"
+static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda12_ ((UserInterface*) self);
+#line 7719 "ui.c"
 }
 
 
-static void __lambda12_ (UserInterface* self) {
+static void __lambda13_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 7734 "ui.c"
+#line 7732 "ui.c"
 }
 
 
-static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda12_ ((UserInterface*) self);
-#line 7741 "ui.c"
+static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda13_ ((UserInterface*) self);
+#line 7739 "ui.c"
 }
 
 
-static void __lambda13_ (UserInterface* self) {
+static void __lambda14_ (UserInterface* self) {
 	gint w = 0;
 	gint h = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 7766 "ui.c"
+#line 7764 "ui.c"
 }
 
 
-static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda13_ ((UserInterface*) self);
-#line 7773 "ui.c"
+static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda14_ ((UserInterface*) self);
+#line 7771 "ui.c"
 }
 
 
-static void __lambda14_ (UserInterface* self) {
+static void __lambda15_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 7789 "ui.c"
+#line 7787 "ui.c"
 }
 
 
-static void ___lambda14__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda14_ ((UserInterface*) self);
-#line 7796 "ui.c"
+static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda15_ ((UserInterface*) self);
+#line 7794 "ui.c"
 }
 
 
-static void __lambda15_ (UserInterface* self) {
+static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 7812 "ui.c"
+#line 7810 "ui.c"
 }
 
 
-static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda15_ ((UserInterface*) self);
-#line 7819 "ui.c"
+static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda16_ ((UserInterface*) self);
+#line 7817 "ui.c"
 }
 
 
-static void __lambda16_ (UserInterface* self) {
+static void __lambda17_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 7835 "ui.c"
+#line 7833 "ui.c"
 }
 
 
-static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda16_ ((UserInterface*) self);
-#line 7842 "ui.c"
+static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda17_ ((UserInterface*) self);
+#line 7840 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
-#line 7849 "ui.c"
+#line 7847 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
-#line 7856 "ui.c"
+#line 7854 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
-#line 7863 "ui.c"
+#line 7861 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb ((UserInterface*) self, i);
-#line 7870 "ui.c"
+#line 7868 "ui.c"
 }
 
 
@@ -7888,1123 +7886,1229 @@ static void user_interface_load (UserInterface* self) {
 	GtkApplication* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-	GtkApplication* _tmp54_ = NULL;
-	GtkInfoBar* _tmp55_ = NULL;
+	GtkApplication* _tmp55_ = NULL;
 	GtkInfoBar* _tmp56_ = NULL;
-	GtkBox* _tmp57_ = NULL;
-	GtkInfoBar* _tmp58_ = NULL;
+	GtkInfoBar* _tmp57_ = NULL;
+	GtkBox* _tmp58_ = NULL;
+	GtkInfoBar* _tmp59_ = NULL;
 	GtkBox* hbox = NULL;
-	GtkBox* _tmp59_ = NULL;
+	GtkBox* _tmp60_ = NULL;
 	GtkContainer* content_area = NULL;
-	GtkInfoBar* _tmp60_ = NULL;
-	GtkContainer* _tmp61_ = NULL;
+	GtkInfoBar* _tmp61_ = NULL;
 	GtkContainer* _tmp62_ = NULL;
 	GtkContainer* _tmp63_ = NULL;
-	GtkBox* _tmp64_ = NULL;
+	GtkContainer* _tmp64_ = NULL;
 	GtkBox* _tmp65_ = NULL;
-	GtkImage* _tmp66_ = NULL;
-	GtkBox* _tmp67_ = NULL;
-	GtkImage* _tmp68_ = NULL;
+	GtkBox* _tmp66_ = NULL;
+	GtkImage* _tmp67_ = NULL;
+	GtkBox* _tmp68_ = NULL;
 	GtkImage* _tmp69_ = NULL;
-	GtkLabel* _tmp70_ = NULL;
+	GtkImage* _tmp70_ = NULL;
 	GtkLabel* _tmp71_ = NULL;
-	GtkBox* _tmp72_ = NULL;
-	GtkLabel* _tmp73_ = NULL;
+	GtkLabel* _tmp72_ = NULL;
+	GtkBox* _tmp73_ = NULL;
 	GtkLabel* _tmp74_ = NULL;
-	GtkInfoBar* _tmp75_ = NULL;
-	const gchar* _tmp76_ = NULL;
-	GtkButton* _tmp77_ = NULL;
+	GtkLabel* _tmp75_ = NULL;
+	GtkInfoBar* _tmp76_ = NULL;
+	const gchar* _tmp77_ = NULL;
 	GtkButton* _tmp78_ = NULL;
-	GtkInfoBar* _tmp79_ = NULL;
-	const gchar* _tmp80_ = NULL;
-	GtkButton* _tmp81_ = NULL;
+	GtkButton* _tmp79_ = NULL;
+	GtkInfoBar* _tmp80_ = NULL;
+	const gchar* _tmp81_ = NULL;
 	GtkButton* _tmp82_ = NULL;
+	GtkButton* _tmp83_ = NULL;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp83_ = NULL;
-	GtkTreeIter _tmp84_ = {0};
-	GtkListStore* _tmp85_ = NULL;
-	GtkTreeIter _tmp86_ = {0};
-	const gchar* _tmp87_ = NULL;
-	GtkListStore* _tmp88_ = NULL;
-	GtkTreeIter _tmp89_ = {0};
-	GtkListStore* _tmp90_ = NULL;
-	GtkTreeIter _tmp91_ = {0};
-	GtkListStore* _tmp92_ = NULL;
-	GtkTreeIter _tmp93_ = {0};
-	GtkListStore* _tmp94_ = NULL;
-	GtkTreeIter _tmp95_ = {0};
-	GtkListStore* _tmp96_ = NULL;
-	GtkTreeIter _tmp97_ = {0};
-	GtkListStore* _tmp98_ = NULL;
-	GtkTreeIter _tmp99_ = {0};
-	GtkListStore* _tmp100_ = NULL;
-	GtkTreeIter _tmp101_ = {0};
-	GtkListStore* _tmp102_ = NULL;
-	GtkTreeIter _tmp103_ = {0};
-	GtkListStore* _tmp104_ = NULL;
-	GtkTreeIter _tmp105_ = {0};
-	GtkListStore* _tmp106_ = NULL;
-	GtkTreeIter _tmp107_ = {0};
-	GtkListStore* _tmp108_ = NULL;
-	GtkTreeIter _tmp109_ = {0};
-	GtkListStore* _tmp110_ = NULL;
-	GtkTreeIter _tmp111_ = {0};
+	GtkListStore* _tmp84_ = NULL;
+	GtkTreeIter _tmp85_ = {0};
+	GtkListStore* _tmp86_ = NULL;
+	GtkTreeIter _tmp87_ = {0};
+	const gchar* _tmp88_ = NULL;
+	GtkListStore* _tmp89_ = NULL;
+	GtkTreeIter _tmp90_ = {0};
+	GtkListStore* _tmp91_ = NULL;
+	GtkTreeIter _tmp92_ = {0};
+	GtkListStore* _tmp93_ = NULL;
+	GtkTreeIter _tmp94_ = {0};
+	GtkListStore* _tmp95_ = NULL;
+	GtkTreeIter _tmp96_ = {0};
+	GtkListStore* _tmp97_ = NULL;
+	GtkTreeIter _tmp98_ = {0};
+	GtkListStore* _tmp99_ = NULL;
+	GtkTreeIter _tmp100_ = {0};
+	GtkListStore* _tmp101_ = NULL;
+	GtkTreeIter _tmp102_ = {0};
+	GtkListStore* _tmp103_ = NULL;
+	GtkTreeIter _tmp104_ = {0};
+	GtkListStore* _tmp105_ = NULL;
+	GtkTreeIter _tmp106_ = {0};
+	GtkListStore* _tmp107_ = NULL;
+	GtkTreeIter _tmp108_ = {0};
+	GtkListStore* _tmp109_ = NULL;
+	GtkTreeIter _tmp110_ = {0};
+	GtkListStore* _tmp111_ = NULL;
+	GtkTreeIter _tmp112_ = {0};
 	gint dpi = 0;
-	GSettings* _tmp112_ = NULL;
-	gint _tmp113_ = 0;
+	GSettings* _tmp113_ = NULL;
 	gint _tmp114_ = 0;
-	GtkComboBox* _tmp115_ = NULL;
-	gint _tmp116_ = 0;
-	GtkComboBox* _tmp117_ = NULL;
-	GSettings* _tmp118_ = NULL;
-	gint _tmp119_ = 0;
+	gint _tmp115_ = 0;
+	GtkComboBox* _tmp116_ = NULL;
+	gint _tmp117_ = 0;
+	GtkComboBox* _tmp118_ = NULL;
+	GSettings* _tmp119_ = NULL;
 	gint _tmp120_ = 0;
-	GtkComboBox* _tmp121_ = NULL;
-	gint _tmp122_ = 0;
-	GtkComboBox* _tmp123_ = NULL;
+	gint _tmp121_ = 0;
+	GtkComboBox* _tmp122_ = NULL;
+	gint _tmp123_ = 0;
+	GtkComboBox* _tmp124_ = NULL;
 	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp124_ = NULL;
-	GtkComboBox* _tmp125_ = NULL;
-	GtkCellRendererText* _tmp126_ = NULL;
-	GtkComboBox* _tmp127_ = NULL;
-	GtkCellRendererText* _tmp128_ = NULL;
+	GtkCellRendererText* _tmp125_ = NULL;
+	GtkComboBox* _tmp126_ = NULL;
+	GtkCellRendererText* _tmp127_ = NULL;
+	GtkComboBox* _tmp128_ = NULL;
 	GtkCellRendererText* _tmp129_ = NULL;
-	GtkComboBox* _tmp130_ = NULL;
-	GtkCellRendererText* _tmp131_ = NULL;
-	GtkComboBox* _tmp132_ = NULL;
-	GtkCellRendererText* _tmp133_ = NULL;
-	GSettings* _tmp134_ = NULL;
-	gint _tmp135_ = 0;
-	GtkComboBox* _tmp136_ = NULL;
-	GtkCellRendererText* _tmp137_ = NULL;
-	GtkComboBox* _tmp138_ = NULL;
-	GtkCellRendererText* _tmp139_ = NULL;
-	GtkComboBox* _tmp140_ = NULL;
-	GtkCellRendererText* _tmp141_ = NULL;
+	GtkCellRendererText* _tmp130_ = NULL;
+	GtkComboBox* _tmp131_ = NULL;
+	GtkCellRendererText* _tmp132_ = NULL;
+	GtkComboBox* _tmp133_ = NULL;
+	GtkCellRendererText* _tmp134_ = NULL;
+	GSettings* _tmp135_ = NULL;
+	gint _tmp136_ = 0;
+	GtkComboBox* _tmp137_ = NULL;
+	GtkCellRendererText* _tmp138_ = NULL;
+	GtkComboBox* _tmp139_ = NULL;
+	GtkCellRendererText* _tmp140_ = NULL;
+	GtkComboBox* _tmp141_ = NULL;
+	GtkCellRendererText* _tmp142_ = NULL;
 	gint paper_width = 0;
-	GSettings* _tmp142_ = NULL;
-	gint _tmp143_ = 0;
+	GSettings* _tmp143_ = NULL;
+	gint _tmp144_ = 0;
 	gint paper_height = 0;
-	GSettings* _tmp144_ = NULL;
-	gint _tmp145_ = 0;
+	GSettings* _tmp145_ = NULL;
 	gint _tmp146_ = 0;
 	gint _tmp147_ = 0;
-	GtkComboBox* _tmp148_ = NULL;
+	gint _tmp148_ = 0;
+	GtkComboBox* _tmp149_ = NULL;
 	gdouble lower = 0.0;
-	GtkAdjustment* _tmp149_ = NULL;
-	gdouble _tmp150_ = 0.0;
+	GtkAdjustment* _tmp150_ = NULL;
 	gdouble _tmp151_ = 0.0;
+	gdouble _tmp152_ = 0.0;
 	gchar* darker_label = NULL;
-	const gchar* _tmp152_ = NULL;
-	gchar* _tmp153_ = NULL;
+	const gchar* _tmp153_ = NULL;
+	gchar* _tmp154_ = NULL;
 	gdouble upper = 0.0;
-	GtkAdjustment* _tmp154_ = NULL;
-	gdouble _tmp155_ = 0.0;
+	GtkAdjustment* _tmp155_ = NULL;
 	gdouble _tmp156_ = 0.0;
+	gdouble _tmp157_ = 0.0;
 	gchar* lighter_label = NULL;
-	const gchar* _tmp157_ = NULL;
-	gchar* _tmp158_ = NULL;
-	GtkScale* _tmp159_ = NULL;
-	gdouble _tmp160_ = 0.0;
-	const gchar* _tmp161_ = NULL;
-	GtkScale* _tmp162_ = NULL;
+	const gchar* _tmp158_ = NULL;
+	gchar* _tmp159_ = NULL;
+	GtkScale* _tmp160_ = NULL;
+	gdouble _tmp161_ = 0.0;
+	const gchar* _tmp162_ = NULL;
 	GtkScale* _tmp163_ = NULL;
-	gdouble _tmp164_ = 0.0;
-	const gchar* _tmp165_ = NULL;
-	GSettings* _tmp166_ = NULL;
-	gint _tmp167_ = 0;
-	GtkAdjustment* _tmp168_ = NULL;
+	GtkScale* _tmp164_ = NULL;
+	gdouble _tmp165_ = 0.0;
+	const gchar* _tmp166_ = NULL;
+	GSettings* _tmp167_ = NULL;
+	gint _tmp168_ = 0;
 	GtkAdjustment* _tmp169_ = NULL;
-	gdouble _tmp170_ = 0.0;
+	GtkAdjustment* _tmp170_ = NULL;
 	gdouble _tmp171_ = 0.0;
+	gdouble _tmp172_ = 0.0;
 	gchar* less_label = NULL;
-	const gchar* _tmp172_ = NULL;
-	gchar* _tmp173_ = NULL;
-	GtkAdjustment* _tmp174_ = NULL;
-	gdouble _tmp175_ = 0.0;
+	const gchar* _tmp173_ = NULL;
+	gchar* _tmp174_ = NULL;
+	GtkAdjustment* _tmp175_ = NULL;
 	gdouble _tmp176_ = 0.0;
+	gdouble _tmp177_ = 0.0;
 	gchar* more_label = NULL;
-	const gchar* _tmp177_ = NULL;
-	gchar* _tmp178_ = NULL;
-	GtkScale* _tmp179_ = NULL;
-	gdouble _tmp180_ = 0.0;
-	const gchar* _tmp181_ = NULL;
-	GtkScale* _tmp182_ = NULL;
+	const gchar* _tmp178_ = NULL;
+	gchar* _tmp179_ = NULL;
+	GtkScale* _tmp180_ = NULL;
+	gdouble _tmp181_ = 0.0;
+	const gchar* _tmp182_ = NULL;
 	GtkScale* _tmp183_ = NULL;
-	gdouble _tmp184_ = 0.0;
-	const gchar* _tmp185_ = NULL;
-	GSettings* _tmp186_ = NULL;
-	gint _tmp187_ = 0;
-	GtkAdjustment* _tmp188_ = NULL;
+	GtkScale* _tmp184_ = NULL;
+	gdouble _tmp185_ = 0.0;
+	const gchar* _tmp186_ = NULL;
+	GSettings* _tmp187_ = NULL;
+	gint _tmp188_ = 0;
 	GtkAdjustment* _tmp189_ = NULL;
-	gdouble _tmp190_ = 0.0;
+	GtkAdjustment* _tmp190_ = NULL;
 	gdouble _tmp191_ = 0.0;
+	gdouble _tmp192_ = 0.0;
 	gchar* minimum_label = NULL;
-	const gchar* _tmp192_ = NULL;
-	gchar* _tmp193_ = NULL;
-	GtkAdjustment* _tmp194_ = NULL;
-	gdouble _tmp195_ = 0.0;
+	const gchar* _tmp193_ = NULL;
+	gchar* _tmp194_ = NULL;
+	GtkAdjustment* _tmp195_ = NULL;
 	gdouble _tmp196_ = 0.0;
+	gdouble _tmp197_ = 0.0;
 	gchar* maximum_label = NULL;
-	const gchar* _tmp197_ = NULL;
-	gchar* _tmp198_ = NULL;
-	GtkScale* _tmp199_ = NULL;
-	gdouble _tmp200_ = 0.0;
-	const gchar* _tmp201_ = NULL;
-	GtkScale* _tmp202_ = NULL;
+	const gchar* _tmp198_ = NULL;
+	gchar* _tmp199_ = NULL;
+	GtkScale* _tmp200_ = NULL;
+	gdouble _tmp201_ = 0.0;
+	const gchar* _tmp202_ = NULL;
 	GtkScale* _tmp203_ = NULL;
-	gdouble _tmp204_ = 0.0;
-	const gchar* _tmp205_ = NULL;
-	GSettings* _tmp206_ = NULL;
-	gint _tmp207_ = 0;
-	GtkAdjustment* _tmp208_ = NULL;
+	GtkScale* _tmp204_ = NULL;
+	gdouble _tmp205_ = 0.0;
+	const gchar* _tmp206_ = NULL;
+	GSettings* _tmp207_ = NULL;
+	gint _tmp208_ = 0;
+	GtkAdjustment* _tmp209_ = NULL;
 	gchar* device = NULL;
-	GSettings* _tmp209_ = NULL;
-	gchar* _tmp210_ = NULL;
-	const gchar* _tmp211_ = NULL;
+	GSettings* _tmp210_ = NULL;
+	gchar* _tmp211_ = NULL;
+	const gchar* _tmp212_ = NULL;
 	gchar* document_type = NULL;
-	GSettings* _tmp217_ = NULL;
-	gchar* _tmp218_ = NULL;
-	const gchar* _tmp219_ = NULL;
-	Book* _tmp221_ = NULL;
-	BookView* _tmp222_ = NULL;
+	GSettings* _tmp218_ = NULL;
+	gchar* _tmp219_ = NULL;
+	const gchar* _tmp220_ = NULL;
+	Book* _tmp222_ = NULL;
 	BookView* _tmp223_ = NULL;
-	GtkBox* _tmp224_ = NULL;
-	BookView* _tmp225_ = NULL;
+	BookView* _tmp224_ = NULL;
+	GtkBox* _tmp225_ = NULL;
 	BookView* _tmp226_ = NULL;
 	BookView* _tmp227_ = NULL;
 	BookView* _tmp228_ = NULL;
 	BookView* _tmp229_ = NULL;
-	GtkDialog* _tmp230_ = NULL;
+	BookView* _tmp230_ = NULL;
 	GtkDialog* _tmp231_ = NULL;
-	gint _tmp232_ = 0;
+	GtkDialog* _tmp232_ = NULL;
 	gint _tmp233_ = 0;
 	gint _tmp234_ = 0;
 	gint _tmp235_ = 0;
-	gboolean _tmp236_ = FALSE;
-	const gchar* _tmp237_ = NULL;
-	ProgressBarDialog* _tmp238_ = NULL;
-	Book* _tmp239_ = NULL;
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp236_ = 0;
+	gboolean _tmp237_ = FALSE;
+	const gchar* _tmp238_ = NULL;
+	ProgressBarDialog* _tmp239_ = NULL;
+	Book* _tmp240_ = NULL;
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1679 "/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 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_application_get_type ()) ? ((GtkApplication*) _tmp1_) : NULL);
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = user_interface_get_shell_shows_menubar (self);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _tmp3_;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp4_) {
-#line 8098 "ui.c"
-		GtkApplication* _tmp5_ = NULL;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = user_interface_is_desktop (self, "Unity");
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = TRUE;
+#line 8096 "ui.c"
+	} else {
+		gboolean _tmp5_ = FALSE;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = user_interface_is_desktop (self, "XFCE");
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = _tmp5_;
+#line 8103 "ui.c"
+	}
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp3_) {
+#line 8107 "ui.c"
+		GtkMenuBar* _tmp6_ = NULL;
+		GtkToolbar* _tmp7_ = NULL;
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = self->priv->menubar;
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = self->priv->toolbar;
+#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_visible ((GtkWidget*) _tmp7_, TRUE);
+#line 8120 "ui.c"
+	} else {
+		GtkApplication* _tmp8_ = NULL;
 		GMenu* appmenu = NULL;
-		GMenu* _tmp6_ = NULL;
-		GMenu* section = NULL;
-		GMenu* _tmp7_ = NULL;
-		GMenu* _tmp8_ = NULL;
 		GMenu* _tmp9_ = NULL;
+		GMenu* section = NULL;
 		GMenu* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		GMenu* _tmp11_ = NULL;
 		GMenu* _tmp12_ = NULL;
 		GMenu* _tmp13_ = NULL;
-		GMenu* _tmp14_ = NULL;
-		GMenu* menu = NULL;
+		const gchar* _tmp14_ = NULL;
 		GMenu* _tmp15_ = NULL;
 		GMenu* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		GMenu* _tmp17_ = NULL;
+		GMenu* menu = NULL;
 		GMenu* _tmp18_ = NULL;
 		GMenu* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
 		GMenu* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		GMenu* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		GMenu* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		GMenu* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GMenu* _tmp29_ = NULL;
+		GMenu* _tmp22_ = NULL;
+		const gchar* _tmp23_ = NULL;
+		GMenu* _tmp24_ = NULL;
+		const gchar* _tmp25_ = NULL;
+		GMenu* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
+		GMenu* _tmp28_ = NULL;
+		const gchar* _tmp29_ = NULL;
 		GMenu* _tmp30_ = NULL;
-		GMenu* _tmp31_ = NULL;
+		const gchar* _tmp31_ = NULL;
 		GMenu* _tmp32_ = NULL;
-		const gchar* _tmp33_ = NULL;
+		GMenu* _tmp33_ = NULL;
 		GMenu* _tmp34_ = NULL;
 		GMenu* _tmp35_ = NULL;
-		GMenu* _tmp36_ = NULL;
+		const gchar* _tmp36_ = NULL;
 		GMenu* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
+		GMenu* _tmp38_ = NULL;
 		GMenu* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		GMenu* _tmp41_ = NULL;
-		const gchar* _tmp42_ = NULL;
-		GtkApplication* _tmp43_ = NULL;
+		GMenu* _tmp40_ = NULL;
+		const gchar* _tmp41_ = NULL;
+		GMenu* _tmp42_ = NULL;
+		const gchar* _tmp43_ = NULL;
 		GMenu* _tmp44_ = NULL;
-		GtkApplication* _tmp45_ = NULL;
+		const gchar* _tmp45_ = NULL;
 		GtkApplication* _tmp46_ = NULL;
-		GtkApplication* _tmp47_ = NULL;
+		GMenu* _tmp47_ = NULL;
 		GtkApplication* _tmp48_ = NULL;
 		GtkApplication* _tmp49_ = NULL;
 		GtkApplication* _tmp50_ = NULL;
 		GtkApplication* _tmp51_ = NULL;
+		GtkApplication* _tmp52_ = NULL;
+		GtkApplication* _tmp53_ = NULL;
+		GtkApplication* _tmp54_ = NULL;
+#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = app;
+#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_action_map_add_action_entries ((GActionMap*) _tmp8_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = g_menu_new ();
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		appmenu = _tmp9_;
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = g_menu_new ();
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		section = _tmp10_;
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = appmenu;
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = section;
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_section (_tmp11_, NULL, (GMenuModel*) _tmp12_);
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = section;
 #line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = app;
+		_tmp14_ = _ ("New Document");
 #line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_action_map_add_action_entries ((GActionMap*) _tmp5_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
+		g_menu_append (_tmp13_, _tmp14_, "app.new_document");
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = g_menu_new ();
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = g_menu_new ();
+		_g_object_unref0 (section);
 #line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		appmenu = _tmp6_;
+		section = _tmp15_;
 #line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = g_menu_new ();
+		_tmp16_ = appmenu;
 #line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp7_;
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = appmenu;
+		_tmp17_ = section;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_section (_tmp16_, NULL, (GMenuModel*) _tmp17_);
 #line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = section;
+		_tmp18_ = g_menu_new ();
 #line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp8_, NULL, (GMenuModel*) _tmp9_);
+		menu = _tmp18_;
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp19_ = section;
 #line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = section;
+		_tmp20_ = _ ("Document");
 #line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = _ ("New Document");
+		_tmp21_ = menu;
 #line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp10_, _tmp11_, "app.new_document");
+		g_menu_append_submenu (_tmp19_, _tmp20_, (GMenuModel*) _tmp21_);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp22_ = menu;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp23_ = _ ("Reorder Pages");
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp22_, _tmp23_, "app.reorder");
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = g_menu_new ();
+		_tmp24_ = menu;
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
+		_tmp25_ = _ ("Save");
 #line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp12_;
+		g_menu_append (_tmp24_, _tmp25_, "app.save");
 #line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = appmenu;
+		_tmp26_ = menu;
 #line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = section;
+		_tmp27_ = _ ("Save As...");
 #line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp13_, NULL, (GMenuModel*) _tmp14_);
+		g_menu_append (_tmp26_, _tmp27_, "app.save_as");
 #line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = g_menu_new ();
+		_tmp28_ = menu;
 #line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		menu = _tmp15_;
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = section;
+		_tmp29_ = _ ("Email...");
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp28_, _tmp29_, "app.email");
 #line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = _ ("Document");
+		_tmp30_ = menu;
 #line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = menu;
+		_tmp31_ = _ ("Print...");
 #line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_submenu (_tmp16_, _tmp17_, (GMenuModel*) _tmp18_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = menu;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp20_ = _ ("Reorder Pages");
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp19_, _tmp20_, "app.reorder");
+		g_menu_append (_tmp30_, _tmp31_, "app.print");
 #line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp21_ = menu;
+		_tmp32_ = g_menu_new ();
 #line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp22_ = _ ("Save");
+		_g_object_unref0 (section);
 #line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp21_, _tmp22_, "app.save");
+		section = _tmp32_;
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp23_ = menu;
+		_tmp33_ = appmenu;
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp24_ = _ ("Save As...");
+		_tmp34_ = section;
 #line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp23_, _tmp24_, "app.save_as");
+		g_menu_append_section (_tmp33_, NULL, (GMenuModel*) _tmp34_);
 #line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp25_ = menu;
+		_tmp35_ = section;
 #line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp26_ = _ ("Email...");
+		_tmp36_ = _ ("Preferences");
 #line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp25_, _tmp26_, "app.email");
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp27_ = menu;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = _ ("Print...");
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp27_, _tmp28_, "app.print");
+		g_menu_append (_tmp35_, _tmp36_, "app.preferences");
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp37_ = g_menu_new ();
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (section);
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		section = _tmp37_;
 #line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = g_menu_new ();
+		_tmp38_ = appmenu;
 #line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
+		_tmp39_ = section;
 #line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp29_;
+		g_menu_append_section (_tmp38_, NULL, (GMenuModel*) _tmp39_);
 #line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = appmenu;
+		_tmp40_ = section;
 #line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = section;
+		_tmp41_ = _ ("Help");
 #line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp30_, NULL, (GMenuModel*) _tmp31_);
+		g_menu_append (_tmp40_, _tmp41_, "app.help");
 #line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = section;
+		_tmp42_ = section;
 #line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = _ ("Preferences");
+		_tmp43_ = _ ("About");
 #line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp32_, _tmp33_, "app.preferences");
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = g_menu_new ();
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		section = _tmp34_;
+		g_menu_append (_tmp42_, _tmp43_, "app.about");
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp44_ = section;
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp45_ = _ ("Quit");
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp44_, _tmp45_, "app.quit");
 #line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp35_ = appmenu;
+		_tmp46_ = app;
 #line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp36_ = section;
+		_tmp47_ = appmenu;
 #line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append_section (_tmp35_, NULL, (GMenuModel*) _tmp36_);
-#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp37_ = section;
-#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp38_ = _ ("Help");
-#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp37_, _tmp38_, "app.help");
-#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp39_ = section;
+		gtk_application_set_app_menu (_tmp46_, (GMenuModel*) _tmp47_);
 #line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp40_ = _ ("About");
+		_tmp48_ = app;
 #line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp39_, _tmp40_, "app.about");
+		gtk_application_add_accelerator (_tmp48_, "<Ctrl>N", "app.new_document", NULL);
 #line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp41_ = section;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp42_ = _ ("Quit");
+		_tmp49_ = app;
 #line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_menu_append (_tmp41_, _tmp42_, "app.quit");
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp43_ = app;
+		gtk_application_add_accelerator (_tmp49_, "<Ctrl>S", "app.save", NULL);
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp50_ = app;
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp50_, "<Shift><Ctrl>S", "app.save_as", NULL);
 #line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp44_ = appmenu;
+		_tmp51_ = app;
 #line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_set_app_menu (_tmp43_, (GMenuModel*) _tmp44_);
+		gtk_application_add_accelerator (_tmp51_, "<Ctrl>E", "app.email", NULL);
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp52_ = app;
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp52_, "<Ctrl>P", "app.print", NULL);
 #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp45_ = app;
+		_tmp53_ = app;
 #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp45_, "<Ctrl>N", "app.new_document", NULL);
+		gtk_application_add_accelerator (_tmp53_, "F1", "app.help", NULL);
 #line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp46_ = app;
+		_tmp54_ = app;
 #line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp46_, "<Ctrl>S", "app.save", NULL);
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp47_ = app;
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp47_, "<Shift><Ctrl>S", "app.save_as", NULL);
+		gtk_application_add_accelerator (_tmp54_, "<Ctrl>Q", "app.quit", NULL);
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (menu);
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (section);
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (appmenu);
+#line 8338 "ui.c"
+	}
 #line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp48_ = app;
+	_tmp55_ = app;
 #line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp48_, "<Ctrl>E", "app.email", NULL);
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp49_ = app;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp49_, "<Ctrl>P", "app.print", NULL);
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp50_ = app;
-#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp50_, "F1", "app.help", NULL);
+	gtk_application_add_window (_tmp55_, (GtkWindow*) self);
 #line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = app;
+	_tmp56_ = (GtkInfoBar*) gtk_info_bar_new ();
 #line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_add_accelerator (_tmp51_, "<Ctrl>Q", "app.quit", NULL);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (menu);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (section);
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (appmenu);
-#line 8315 "ui.c"
-	} else {
-		GtkMenuBar* _tmp52_ = NULL;
-		GtkToolbar* _tmp53_ = NULL;
+	g_object_ref_sink (_tmp56_);
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar);
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar = _tmp56_;
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = self->priv->info_bar;
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp57_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp58_ = self->priv->main_vbox;
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp59_ = self->priv->info_bar;
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, TRUE, (guint) 0);
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp60_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp60_);
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	hbox = _tmp60_;
 #line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
+	_tmp61_ = self->priv->info_bar;
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = gtk_info_bar_get_content_area (_tmp61_);
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp62_) : NULL);
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	content_area = _tmp63_;
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = content_area;
 #line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp52_ = self->priv->menubar;
+	_tmp65_ = hbox;
 #line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp52_, TRUE);
+	gtk_container_add (_tmp64_, (GtkWidget*) _tmp65_);
 #line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp53_ = self->priv->toolbar;
+	_tmp66_ = hbox;
 #line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp53_, TRUE);
-#line 8329 "ui.c"
-	}
+	gtk_widget_set_visible ((GtkWidget*) _tmp66_, TRUE);
 #line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = app;
+	_tmp67_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
 #line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_application_add_window (_tmp54_, (GtkWindow*) self);
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp55_);
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar);
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar = _tmp55_;
+	g_object_ref_sink (_tmp67_);
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_image);
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_image = _tmp67_;
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = hbox;
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = self->priv->info_bar_image;
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp68_, (GtkWidget*) _tmp69_, FALSE, TRUE, (guint) 0);
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp70_ = self->priv->info_bar_image;
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
 #line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = self->priv->info_bar;
+	_tmp71_ = (GtkLabel*) gtk_label_new (NULL);
 #line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp56_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = self->priv->main_vbox;
+	g_object_ref_sink (_tmp71_);
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_label);
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_label = _tmp71_;
 #line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = self->priv->info_bar;
+	_tmp72_ = self->priv->info_bar_label;
 #line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp57_, (GtkWidget*) _tmp58_, FALSE, TRUE, (guint) 0);
+	gtk_misc_set_alignment ((GtkMisc*) _tmp72_, 0.0f, 0.5f);
 #line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	_tmp73_ = hbox;
 #line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp59_);
+	_tmp74_ = self->priv->info_bar_label;
 #line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	hbox = _tmp59_;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = self->priv->info_bar;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = gtk_info_bar_get_content_area (_tmp60_);
+	gtk_box_pack_start (_tmp73_, (GtkWidget*) _tmp74_, TRUE, TRUE, (guint) 0);
 #line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, GTK_TYPE_CONTAINER) ? ((GtkContainer*) _tmp61_) : NULL);
+	_tmp75_ = self->priv->info_bar_label;
 #line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	content_area = _tmp62_;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = content_area;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = hbox;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add (_tmp63_, (GtkWidget*) _tmp64_);
+	gtk_widget_set_visible ((GtkWidget*) _tmp75_, TRUE);
 #line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = hbox;
+	_tmp76_ = self->priv->info_bar;
 #line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp65_, TRUE);
-#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp66_);
-#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_image);
-#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_image = _tmp66_;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = hbox;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = self->priv->info_bar_image;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, FALSE, TRUE, (guint) 0);
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = self->priv->info_bar_image;
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp69_, TRUE);
+	_tmp77_ = _ ("_Close");
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp78_ = gtk_info_bar_add_button (_tmp76_, _tmp77_, (gint) GTK_RESPONSE_CLOSE);
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_button_get_type ()) ? ((GtkButton*) _tmp78_) : NULL);
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_close_button);
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_close_button = _tmp79_;
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp80_ = self->priv->info_bar;
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp81_ = _ ("Change _Scanner");
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, 1);
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_button_get_type ()) ? ((GtkButton*) _tmp82_) : NULL);
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_change_scanner_button = _tmp83_;
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp84_ = self->priv->paper_size_model;
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp84_, &_tmp85_);
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp85_;
 #line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = (GtkLabel*) gtk_label_new (NULL);
+	_tmp86_ = self->priv->paper_size_model;
 #line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp70_);
+	_tmp87_ = iter;
 #line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_label);
+	_tmp88_ = _ ("Automatic");
 #line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_label = _tmp70_;
-#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = self->priv->info_bar_label;
-#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_misc_set_alignment ((GtkMisc*) _tmp71_, 0.0f, 0.5f);
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = hbox;
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp73_ = self->priv->info_bar_label;
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, TRUE, TRUE, (guint) 0);
+	gtk_list_store_set (_tmp86_, &_tmp87_, 0, 0, 1, 0, 2, _tmp88_, -1, -1);
 #line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = self->priv->info_bar_label;
+	_tmp89_ = self->priv->paper_size_model;
 #line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = self->priv->info_bar;
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = _ ("_Close");
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp77_ = gtk_info_bar_add_button (_tmp75_, _tmp76_, (gint) GTK_RESPONSE_CLOSE);
+	gtk_list_store_append (_tmp89_, &_tmp90_);
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp90_;
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp91_ = self->priv->paper_size_model;
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp92_ = iter;
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp91_, &_tmp92_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
 #line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp78_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp77_) : NULL);
+	_tmp93_ = self->priv->paper_size_model;
 #line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_close_button);
+	gtk_list_store_append (_tmp93_, &_tmp94_);
 #line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_close_button = _tmp78_;
+	iter = _tmp94_;
 #line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp79_ = self->priv->info_bar;
+	_tmp95_ = self->priv->paper_size_model;
 #line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp80_ = _ ("Change _Scanner");
+	_tmp96_ = iter;
 #line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp81_ = gtk_info_bar_add_button (_tmp79_, _tmp80_, 1);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp82_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp81_) : NULL);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_change_scanner_button = _tmp82_;
+	gtk_list_store_set (_tmp95_, &_tmp96_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp97_ = self->priv->paper_size_model;
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp97_, &_tmp98_);
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp98_;
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp99_ = self->priv->paper_size_model;
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp100_ = iter;
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp101_ = self->priv->paper_size_model;
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp101_, &_tmp102_);
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp102_;
 #line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp83_ = self->priv->paper_size_model;
+	_tmp103_ = self->priv->paper_size_model;
 #line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp83_, &_tmp84_);
+	_tmp104_ = iter;
 #line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp84_;
+	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
 #line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = self->priv->paper_size_model;
+	_tmp105_ = self->priv->paper_size_model;
 #line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = iter;
+	gtk_list_store_append (_tmp105_, &_tmp106_);
 #line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp87_ = _ ("Automatic");
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp85_, &_tmp86_, 0, 0, 1, 0, 2, _tmp87_, -1, -1);
+	iter = _tmp106_;
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp107_ = self->priv->paper_size_model;
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp108_ = iter;
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp109_ = self->priv->paper_size_model;
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp109_, &_tmp110_);
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp110_;
 #line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = self->priv->paper_size_model;
+	_tmp111_ = self->priv->paper_size_model;
 #line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp88_, &_tmp89_);
+	_tmp112_ = iter;
 #line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp89_;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = self->priv->paper_size_model;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = iter;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp90_, &_tmp91_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
+	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
 #line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = self->priv->paper_size_model;
+	_tmp113_ = self->priv->settings;
 #line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp92_, &_tmp93_);
+	_tmp114_ = g_settings_get_int (_tmp113_, "text-dpi");
 #line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp93_;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp94_ = self->priv->paper_size_model;
+	dpi = _tmp114_;
 #line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = iter;
+	_tmp115_ = dpi;
 #line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp96_ = self->priv->paper_size_model;
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp96_, &_tmp97_);
+	if (_tmp115_ <= 0) {
 #line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp97_;
+		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
+#line 8548 "ui.c"
+	}
 #line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp98_ = self->priv->paper_size_model;
+	_tmp116_ = self->priv->text_dpi_combo;
 #line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp99_ = iter;
+	_tmp117_ = dpi;
 #line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp98_, &_tmp99_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+	user_interface_set_dpi_combo (self, _tmp116_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp117_);
 #line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp100_ = self->priv->paper_size_model;
+	_tmp118_ = self->priv->text_dpi_combo;
 #line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp100_, &_tmp101_);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp101_;
+	g_signal_connect_object (_tmp118_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
 #line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp102_ = self->priv->paper_size_model;
+	_tmp119_ = self->priv->settings;
 #line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp103_ = iter;
+	_tmp120_ = g_settings_get_int (_tmp119_, "photo-dpi");
 #line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp102_, &_tmp103_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp104_ = self->priv->paper_size_model;
+	dpi = _tmp120_;
 #line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp104_, &_tmp105_);
+	_tmp121_ = dpi;
 #line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp105_;
+	if (_tmp121_ <= 0) {
 #line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp106_ = self->priv->paper_size_model;
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp107_ = iter;
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp106_, &_tmp107_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
+#line 8572 "ui.c"
+	}
 #line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp108_ = self->priv->paper_size_model;
+	_tmp122_ = self->priv->photo_dpi_combo;
 #line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp108_, &_tmp109_);
+	_tmp123_ = dpi;
 #line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp109_;
+	user_interface_set_dpi_combo (self, _tmp122_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp123_);
 #line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp110_ = self->priv->paper_size_model;
+	_tmp124_ = self->priv->photo_dpi_combo;
 #line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = iter;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp110_, &_tmp111_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
+	g_signal_connect_object (_tmp124_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
 #line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp112_ = self->priv->settings;
+	_tmp125_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = g_settings_get_int (_tmp112_, "text-dpi");
+	g_object_ref_sink (_tmp125_);
 #line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp113_;
+	renderer = _tmp125_;
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp126_ = self->priv->device_combo;
 #line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = dpi;
+	_tmp127_ = renderer;
 #line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp114_ <= 0) {
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp126_, (GtkCellRenderer*) _tmp127_, TRUE);
 #line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 8539 "ui.c"
-	}
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = self->priv->text_dpi_combo;
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = dpi;
-#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp115_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp116_);
+	_tmp128_ = self->priv->device_combo;
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp129_ = renderer;
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp128_, (GtkCellRenderer*) _tmp129_, "text", 1);
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp130_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = self->priv->text_dpi_combo;
+	g_object_ref_sink (_tmp130_);
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (renderer);
 #line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp117_, "changed", (GCallback) ___lambda10__gtk_combo_box_changed, self, 0);
+	renderer = _tmp130_;
 #line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp118_ = self->priv->settings;
+	_tmp131_ = self->priv->page_side_combo;
 #line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp119_ = g_settings_get_int (_tmp118_, "photo-dpi");
+	_tmp132_ = renderer;
 #line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp119_;
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp131_, (GtkCellRenderer*) _tmp132_, TRUE);
 #line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = dpi;
+	_tmp133_ = self->priv->page_side_combo;
 #line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp120_ <= 0) {
+	_tmp134_ = renderer;
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp133_, (GtkCellRenderer*) _tmp134_, "text", 1);
 #line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 8563 "ui.c"
-	}
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp121_ = self->priv->photo_dpi_combo;
+	_tmp135_ = self->priv->settings;
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp136_ = g_settings_get_enum (_tmp135_, "page-side");
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_page_side (self, (ScanType) _tmp136_);
 #line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp122_ = dpi;
+	_tmp137_ = self->priv->page_side_combo;
 #line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp121_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp122_);
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp123_ = self->priv->photo_dpi_combo;
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp123_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (_tmp137_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp138_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp138_);
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (renderer);
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp138_;
 #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp124_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp139_ = self->priv->paper_size_combo;
 #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp124_);
+	_tmp140_ = renderer;
 #line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp124_;
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
 #line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp125_ = self->priv->device_combo;
+	_tmp141_ = self->priv->paper_size_combo;
 #line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp126_ = renderer;
+	_tmp142_ = renderer;
 #line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp125_, (GtkCellRenderer*) _tmp126_, TRUE);
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 2);
 #line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp127_ = self->priv->device_combo;
+	_tmp143_ = self->priv->settings;
 #line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp128_ = renderer;
+	_tmp144_ = g_settings_get_int (_tmp143_, "paper-width");
 #line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp127_, (GtkCellRenderer*) _tmp128_, "text", 1);
+	paper_width = _tmp144_;
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp145_ = self->priv->settings;
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp146_ = g_settings_get_int (_tmp145_, "paper-height");
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_height = _tmp146_;
 #line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp129_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp147_ = paper_width;
 #line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp129_);
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
+	_tmp148_ = paper_height;
 #line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp129_;
+	user_interface_set_paper_size (self, _tmp147_, _tmp148_);
 #line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp130_ = self->priv->page_side_combo;
+	_tmp149_ = self->priv->paper_size_combo;
 #line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp131_ = renderer;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, TRUE);
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp132_ = self->priv->page_side_combo;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp133_ = renderer;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp132_, (GtkCellRenderer*) _tmp133_, "text", 1);
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp134_ = self->priv->settings;
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp135_ = g_settings_get_enum (_tmp134_, "page-side");
-#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_page_side (self, (ScanType) _tmp135_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp136_ = self->priv->page_side_combo;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp136_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp137_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp137_);
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (renderer);
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp137_;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp138_ = self->priv->paper_size_combo;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp139_ = renderer;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp138_, (GtkCellRenderer*) _tmp139_, TRUE);
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp140_ = self->priv->paper_size_combo;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp141_ = renderer;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp140_, (GtkCellRenderer*) _tmp141_, "text", 2);
+	g_signal_connect_object (_tmp149_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
 #line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp142_ = self->priv->settings;
+	_tmp150_ = self->priv->brightness_adjustment;
 #line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp143_ = g_settings_get_int (_tmp142_, "paper-width");
+	_tmp151_ = gtk_adjustment_get_lower (_tmp150_);
 #line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp143_;
+	_tmp152_ = _tmp151_;
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp152_;
 #line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp144_ = self->priv->settings;
+	_tmp153_ = _ ("Darker");
 #line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp145_ = g_settings_get_int (_tmp144_, "paper-height");
+	_tmp154_ = g_strdup_printf ("<small>%s</small>", _tmp153_);
 #line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp145_;
+	darker_label = _tmp154_;
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp155_ = self->priv->brightness_adjustment;
 #line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp146_ = paper_width;
+	_tmp156_ = gtk_adjustment_get_upper (_tmp155_);
 #line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp147_ = paper_height;
+	_tmp157_ = _tmp156_;
 #line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_paper_size (self, _tmp146_, _tmp147_);
+	upper = _tmp157_;
 #line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp148_ = self->priv->paper_size_combo;
+	_tmp158_ = _ ("Lighter");
 #line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp148_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp149_ = self->priv->brightness_adjustment;
+	_tmp159_ = g_strdup_printf ("<small>%s</small>", _tmp158_);
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lighter_label = _tmp159_;
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp160_ = self->priv->brightness_scale;
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp161_ = lower;
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp162_ = darker_label;
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp160_, _tmp161_, GTK_POS_BOTTOM, _tmp162_);
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp163_ = self->priv->brightness_scale;
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp163_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp164_ = self->priv->brightness_scale;
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp165_ = upper;
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp166_ = lighter_label;
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp164_, _tmp165_, GTK_POS_BOTTOM, _tmp166_);
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp167_ = self->priv->settings;
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp168_ = g_settings_get_int (_tmp167_, "brightness");
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_brightness (self, _tmp168_);
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp169_ = self->priv->brightness_adjustment;
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp169_, "value-changed", (GCallback) ___lambda15__gtk_adjustment_value_changed, self, 0);
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp170_ = self->priv->contrast_adjustment;
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp171_ = gtk_adjustment_get_lower (_tmp170_);
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp172_ = _tmp171_;
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp172_;
 #line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp150_ = gtk_adjustment_get_lower (_tmp149_);
+	_tmp173_ = _ ("Less");
 #line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp151_ = _tmp150_;
+	_tmp174_ = g_strdup_printf ("<small>%s</small>", _tmp173_);
 #line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp151_;
+	less_label = _tmp174_;
 #line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp152_ = _ ("Darker");
+	_tmp175_ = self->priv->contrast_adjustment;
 #line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp153_ = g_strdup_printf ("<small>%s</small>", _tmp152_);
+	_tmp176_ = gtk_adjustment_get_upper (_tmp175_);
 #line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	darker_label = _tmp153_;
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp154_ = self->priv->brightness_adjustment;
+	_tmp177_ = _tmp176_;
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp177_;
 #line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp155_ = gtk_adjustment_get_upper (_tmp154_);
+	_tmp178_ = _ ("More");
 #line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp156_ = _tmp155_;
+	_tmp179_ = g_strdup_printf ("<small>%s</small>", _tmp178_);
 #line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp156_;
+	more_label = _tmp179_;
 #line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp157_ = _ ("Lighter");
+	_tmp180_ = self->priv->contrast_scale;
 #line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp158_ = g_strdup_printf ("<small>%s</small>", _tmp157_);
+	_tmp181_ = lower;
 #line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lighter_label = _tmp158_;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp159_ = self->priv->brightness_scale;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp160_ = lower;
+	_tmp182_ = less_label;
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp180_, _tmp181_, GTK_POS_BOTTOM, _tmp182_);
 #line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp161_ = darker_label;
+	_tmp183_ = self->priv->contrast_scale;
 #line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp159_, _tmp160_, GTK_POS_BOTTOM, _tmp161_);
+	gtk_scale_add_mark (_tmp183_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
 #line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp162_ = self->priv->brightness_scale;
+	_tmp184_ = self->priv->contrast_scale;
 #line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp162_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp163_ = self->priv->brightness_scale;
+	_tmp185_ = upper;
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp186_ = more_label;
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp184_, _tmp185_, GTK_POS_BOTTOM, _tmp186_);
 #line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp164_ = upper;
+	_tmp187_ = self->priv->settings;
 #line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp165_ = lighter_label;
+	_tmp188_ = g_settings_get_int (_tmp187_, "contrast");
 #line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp163_, _tmp164_, GTK_POS_BOTTOM, _tmp165_);
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp166_ = self->priv->settings;
+	user_interface_set_contrast (self, _tmp188_);
 #line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp167_ = g_settings_get_int (_tmp166_, "brightness");
+	_tmp189_ = self->priv->contrast_adjustment;
 #line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_brightness (self, _tmp167_);
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp168_ = self->priv->brightness_adjustment;
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp168_, "value-changed", (GCallback) ___lambda14__gtk_adjustment_value_changed, self, 0);
+	g_signal_connect_object (_tmp189_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp190_ = self->priv->quality_adjustment;
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp191_ = gtk_adjustment_get_lower (_tmp190_);
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp192_ = _tmp191_;
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp192_;
 #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp169_ = self->priv->contrast_adjustment;
+	_tmp193_ = _ ("Minimum");
 #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp170_ = gtk_adjustment_get_lower (_tmp169_);
+	_tmp194_ = g_strdup_printf ("<small>%s</small>", _tmp193_);
 #line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp171_ = _tmp170_;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp171_;
+	minimum_label = _tmp194_;
 #line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp172_ = _ ("Less");
+	_tmp195_ = self->priv->quality_adjustment;
 #line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp173_ = g_strdup_printf ("<small>%s</small>", _tmp172_);
+	_tmp196_ = gtk_adjustment_get_upper (_tmp195_);
 #line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	less_label = _tmp173_;
-#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp174_ = self->priv->contrast_adjustment;
+	_tmp197_ = _tmp196_;
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp197_;
 #line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp175_ = gtk_adjustment_get_upper (_tmp174_);
+	_tmp198_ = _ ("Maximum");
 #line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp176_ = _tmp175_;
+	_tmp199_ = g_strdup_printf ("<small>%s</small>", _tmp198_);
 #line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp176_;
+	maximum_label = _tmp199_;
 #line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp177_ = _ ("More");
+	_tmp200_ = self->priv->quality_scale;
 #line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp178_ = g_strdup_printf ("<small>%s</small>", _tmp177_);
+	_tmp201_ = lower;
 #line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	more_label = _tmp178_;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp179_ = self->priv->contrast_scale;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp180_ = lower;
+	_tmp202_ = minimum_label;
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp200_, _tmp201_, GTK_POS_BOTTOM, _tmp202_);
 #line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp181_ = less_label;
+	_tmp203_ = self->priv->quality_scale;
 #line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp179_, _tmp180_, GTK_POS_BOTTOM, _tmp181_);
+	gtk_scale_add_mark (_tmp203_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
 #line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp182_ = self->priv->contrast_scale;
+	_tmp204_ = self->priv->quality_scale;
 #line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp182_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp183_ = self->priv->contrast_scale;
+	_tmp205_ = upper;
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp206_ = maximum_label;
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp204_, _tmp205_, GTK_POS_BOTTOM, _tmp206_);
 #line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp184_ = upper;
+	_tmp207_ = self->priv->settings;
 #line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp185_ = more_label;
+	_tmp208_ = g_settings_get_int (_tmp207_, "jpeg-quality");
 #line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp183_, _tmp184_, GTK_POS_BOTTOM, _tmp185_);
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp186_ = self->priv->settings;
+	user_interface_set_quality (self, _tmp208_);
 #line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp187_ = g_settings_get_int (_tmp186_, "contrast");
+	_tmp209_ = self->priv->quality_adjustment;
 #line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_contrast (self, _tmp187_);
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp188_ = self->priv->contrast_adjustment;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp188_, "value-changed", (GCallback) ___lambda15__gtk_adjustment_value_changed, self, 0);
+	g_signal_connect_object (_tmp209_, "value-changed", (GCallback) ___lambda17__gtk_adjustment_value_changed, self, 0);
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp210_ = self->priv->settings;
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp211_ = g_settings_get_string (_tmp210_, "selected-device");
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	device = _tmp211_;
 #line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp189_ = self->priv->quality_adjustment;
+	_tmp212_ = device;
 #line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp190_ = gtk_adjustment_get_lower (_tmp189_);
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp191_ = _tmp190_;
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp191_;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp192_ = _ ("Minimum");
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp193_ = g_strdup_printf ("<small>%s</small>", _tmp192_);
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	minimum_label = _tmp193_;
+	if (_tmp212_ != NULL) {
+#line 8858 "ui.c"
+		const gchar* _tmp213_ = NULL;
+		GtkTreeIter _tmp214_ = {0};
+		gboolean _tmp215_ = FALSE;
 #line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp194_ = self->priv->quality_adjustment;
+		_tmp213_ = device;
 #line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp195_ = gtk_adjustment_get_upper (_tmp194_);
+		_tmp215_ = user_interface_find_scan_device (self, _tmp213_, &_tmp214_);
 #line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp196_ = _tmp195_;
+		iter = _tmp214_;
 #line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp196_;
+		if (_tmp215_) {
+#line 8870 "ui.c"
+			GtkComboBox* _tmp216_ = NULL;
+			GtkTreeIter _tmp217_ = {0};
 #line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp197_ = _ ("Maximum");
+			_tmp216_ = self->priv->device_combo;
 #line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp198_ = g_strdup_printf ("<small>%s</small>", _tmp197_);
+			_tmp217_ = iter;
 #line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	maximum_label = _tmp198_;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp199_ = self->priv->quality_scale;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp200_ = lower;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp201_ = minimum_label;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp199_, _tmp200_, GTK_POS_BOTTOM, _tmp201_);
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp202_ = self->priv->quality_scale;
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp202_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp203_ = self->priv->quality_scale;
+			gtk_combo_box_set_active_iter (_tmp216_, &_tmp217_);
+#line 8879 "ui.c"
+		}
+	}
 #line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp204_ = upper;
+	_tmp218_ = self->priv->settings;
 #line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp205_ = maximum_label;
+	_tmp219_ = g_settings_get_string (_tmp218_, "document-type");
 #line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp203_, _tmp204_, GTK_POS_BOTTOM, _tmp205_);
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp206_ = self->priv->settings;
+	document_type = _tmp219_;
 #line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp207_ = g_settings_get_int (_tmp206_, "jpeg-quality");
+	_tmp220_ = document_type;
 #line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_quality (self, _tmp207_);
+	if (_tmp220_ != NULL) {
+#line 8892 "ui.c"
+		const gchar* _tmp221_ = NULL;
 #line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp208_ = self->priv->quality_adjustment;
+		_tmp221_ = document_type;
 #line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp208_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
+		user_interface_set_document_hint (self, _tmp221_, FALSE);
+#line 8898 "ui.c"
+	}
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp222_ = self->priv->_book;
 #line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp209_ = self->priv->settings;
+	_tmp223_ = book_view_new (_tmp222_);
 #line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp210_ = g_settings_get_string (_tmp209_, "selected-device");
+	g_object_ref_sink (_tmp223_);
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->book_view);
 #line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	device = _tmp210_;
+	self->priv->book_view = _tmp223_;
 #line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp211_ = device;
+	_tmp224_ = self->priv->book_view;
 #line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp211_ != NULL) {
-#line 8849 "ui.c"
-		const gchar* _tmp212_ = NULL;
-		GtkTreeIter _tmp213_ = {0};
-		gboolean _tmp214_ = FALSE;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp212_ = device;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp214_ = user_interface_find_scan_device (self, _tmp212_, &_tmp213_);
+	gtk_container_set_border_width ((GtkContainer*) _tmp224_, (guint) 18);
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp225_ = self->priv->main_vbox;
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp226_ = self->priv->book_view;
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_end (_tmp225_, (GtkWidget*) _tmp226_, TRUE, TRUE, (guint) 0);
 #line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp213_;
+	_tmp227_ = self->priv->book_view;
 #line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp214_) {
-#line 8861 "ui.c"
-			GtkComboBox* _tmp215_ = NULL;
-			GtkTreeIter _tmp216_ = {0};
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp215_ = self->priv->device_combo;
+	g_signal_connect_object (_tmp227_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
 #line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp216_ = iter;
+	_tmp228_ = self->priv->book_view;
 #line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active_iter (_tmp215_, &_tmp216_);
-#line 8870 "ui.c"
-		}
-	}
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp217_ = self->priv->settings;
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp218_ = g_settings_get_string (_tmp217_, "document-type");
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp218_;
+	g_signal_connect_object (_tmp228_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp229_ = self->priv->book_view;
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp229_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp230_ = self->priv->book_view;
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp230_, TRUE);
 #line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp219_ = document_type;
+	_tmp231_ = self->priv->authorize_dialog;
 #line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp219_ != NULL) {
-#line 8883 "ui.c"
-		const gchar* _tmp220_ = NULL;
+	gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
 #line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp220_ = document_type;
+	_tmp232_ = self->priv->preferences_dialog;
 #line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp220_, FALSE);
-#line 8889 "ui.c"
-	}
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp221_ = self->priv->_book;
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp222_ = book_view_new (_tmp221_);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp222_);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->book_view);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_view = _tmp222_;
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp223_ = self->priv->book_view;
+	gtk_window_set_transient_for ((GtkWindow*) _tmp232_, (GtkWindow*) self);
 #line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp223_, (guint) 18);
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp224_ = self->priv->main_vbox;
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp225_ = self->priv->book_view;
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end (_tmp224_, (GtkWidget*) _tmp225_, TRUE, TRUE, (guint) 0);
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = self->priv->book_view;
-#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp226_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
+	user_interface_load_state (self);
 #line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = self->priv->book_view;
+	_tmp233_ = self->priv->window_width;
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp234_ = self->priv->window_height;
 #line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp227_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
+	g_debug ("ui.vala:1848: Restoring window to %dx%d pixels", _tmp233_, _tmp234_);
 #line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp228_ = self->priv->book_view;
+	_tmp235_ = self->priv->window_width;
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp236_ = self->priv->window_height;
 #line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp228_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
+	gtk_window_set_default_size ((GtkWindow*) self, _tmp235_, _tmp236_);
 #line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp229_ = self->priv->book_view;
+	_tmp237_ = self->priv->window_is_maximized;
 #line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp229_, TRUE);
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp230_ = self->priv->authorize_dialog;
+	if (_tmp237_) {
 #line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp230_, (GtkWindow*) self);
+		g_debug ("ui.vala:1852: Restoring window to maximized");
 #line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = self->priv->preferences_dialog;
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_load_state (self);
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp232_ = self->priv->window_width;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp233_ = self->priv->window_height;
-#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1859: Restoring window to %dx%d pixels", _tmp232_, _tmp233_);
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp234_ = self->priv->window_width;
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp235_ = self->priv->window_height;
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size ((GtkWindow*) self, _tmp234_, _tmp235_);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp236_ = self->priv->window_is_maximized;
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp236_) {
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1863: Restoring window to maximized");
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_maximize ((GtkWindow*) self);
-#line 8957 "ui.c"
+#line 8966 "ui.c"
 	}
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp237_ = _ ("Saving document...");
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp237_);
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp238_);
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = _ ("Saving document...");
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp239_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp238_);
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp239_);
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->progress_dialog = _tmp238_;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = self->priv->_book;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp239_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->progress_dialog = _tmp239_;
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp240_ = self->priv->_book;
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp240_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 8997 "ui.c"
+#line 9006 "ui.c"
+}
+
+
+static gboolean user_interface_is_desktop (UserInterface* self, const gchar* name) {
+	gboolean result = FALSE;
+	gchar* desktop_name_list = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar** _tmp4_ = NULL;
+	gchar** _tmp5_ = NULL;
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (name != NULL, FALSE);
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	desktop_name_list = _tmp1_;
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = desktop_name_list;
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_ == NULL) {
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = FALSE;
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (desktop_name_list);
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 9039 "ui.c"
+	}
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = desktop_name_list;
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
+#line 9045 "ui.c"
+	{
+		gchar** n_collection = NULL;
+		gint n_collection_length1 = 0;
+		gint _n_collection_size_ = 0;
+		gint n_it = 0;
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		n_collection = _tmp5_;
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		n_collection_length1 = _vala_array_length (_tmp4_);
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		for (n_it = 0; n_it < _vala_array_length (_tmp4_); n_it = n_it + 1) {
+#line 9057 "ui.c"
+			gchar* _tmp6_ = NULL;
+			gchar* n = NULL;
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp6_ = g_strdup (n_collection[n_it]);
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			n = _tmp6_;
+#line 9064 "ui.c"
+			{
+				const gchar* _tmp7_ = NULL;
+				const gchar* _tmp8_ = NULL;
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp7_ = n;
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp8_ = name;
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					result = TRUE;
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_g_free0 (n);
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_g_free0 (desktop_name_list);
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					return result;
+#line 9084 "ui.c"
+				}
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (n);
+#line 9088 "ui.c"
+			}
+		}
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
+#line 9093 "ui.c"
+	}
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = FALSE;
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (desktop_name_list);
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 9101 "ui.c"
 }
 
 
@@ -9032,51 +9136,51 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GQuark _tmp29_ = 0U;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label0 = 0;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label1 = 0;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label2 = 0;
-#line 9031 "ui.c"
+#line 9135 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
 #line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1878: Loading state from %s", _tmp2_);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp2_);
 #line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = g_key_file_new ();
+	g_debug ("ui.vala:1880: Loading state from %s", _tmp2_);
 #line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp2_);
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = g_key_file_new ();
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 9049 "ui.c"
+#line 9153 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 9069 "ui.c"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9173 "ui.c"
 			goto __catch21_g_error;
 		}
 	}
@@ -9085,310 +9189,310 @@ static void user_interface_load_state (UserInterface* self) {
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 9086 "ui.c"
+#line 9190 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:1888: Failed to load state: %s", _tmp10_);
-#line 9095 "ui.c"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:1890: Failed to load state: %s", _tmp10_);
+#line 9199 "ui.c"
 		}
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 9099 "ui.c"
+#line 9203 "ui.c"
 	}
 	__finally21:
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9112 "ui.c"
+#line 9216 "ui.c"
 	}
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 9126 "ui.c"
+#line 9230 "ui.c"
 	}
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 9140 "ui.c"
+#line 9244 "ui.c"
 	}
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp20_;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp22_;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp24_;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = user_interface_state_get_string (self, _tmp25_, "last-page", "scan-direction", "top-to-bottom");
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _tmp26_;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp27_);
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9180 "ui.c"
+#line 9284 "ui.c"
 			default:
 			{
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9187 "ui.c"
+#line 9291 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9193 "ui.c"
+#line 9297 "ui.c"
 			default:
 			{
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9200 "ui.c"
+#line 9304 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9206 "ui.c"
+#line 9310 "ui.c"
 			default:
 			{
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9213 "ui.c"
+#line 9317 "ui.c"
 			}
 		}
 	} else {
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9219 "ui.c"
+#line 9323 "ui.c"
 			default:
 			{
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9226 "ui.c"
+#line 9330 "ui.c"
 			}
 		}
 	}
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 9232 "ui.c"
+#line 9336 "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 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 9247 "ui.c"
+#line 9351 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 9266 "ui.c"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9370 "ui.c"
 			goto __catch22_g_error;
 		}
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9273 "ui.c"
+#line 9377 "ui.c"
 	}
 	goto __finally22;
 	__catch22_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9289 "ui.c"
+#line 9393 "ui.c"
 	}
 	__finally22:
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 9298 "ui.c"
+#line 9402 "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 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 9313 "ui.c"
+#line 9417 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 9332 "ui.c"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9436 "ui.c"
 			goto __catch23_g_error;
 		}
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9339 "ui.c"
+#line 9443 "ui.c"
 	}
 	goto __finally23;
 	__catch23_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9355 "ui.c"
+#line 9459 "ui.c"
 	}
 	__finally23:
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 9364 "ui.c"
+#line 9468 "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 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 9381 "ui.c"
+#line 9485 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
@@ -9396,83 +9500,83 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 9401 "ui.c"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9505 "ui.c"
 			goto __catch24_g_error;
 		}
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9414 "ui.c"
+#line 9518 "ui.c"
 	}
 	goto __finally24;
 	__catch24_g_error:
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9433 "ui.c"
+#line 9537 "ui.c"
 	}
 	__finally24:
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 9442 "ui.c"
+#line 9546 "ui.c"
 }
 
 
-static gboolean ___lambda9_ (UserInterface* self) {
+static gboolean ___lambda10_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9456 "ui.c"
+#line 9560 "ui.c"
 }
 
 
-static gboolean ____lambda9__gsource_func (gpointer self) {
+static gboolean ____lambda10__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda9_ ((UserInterface*) self);
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda10_ ((UserInterface*) self);
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9465 "ui.c"
+#line 9569 "ui.c"
 }
 
 
@@ -9497,145 +9601,145 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
 #line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 9496 "ui.c"
+#line 9600 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 9503 "ui.c"
+#line 9607 "ui.c"
 			guint _tmp2_ = 0U;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 9509 "ui.c"
+#line 9613 "ui.c"
 		}
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda9__gsource_func, g_object_ref (self), g_object_unref);
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda10__gsource_func, g_object_ref (self), g_object_unref);
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9517 "ui.c"
+#line 9621 "ui.c"
 	}
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1969: Saving state to %s", _tmp6_);
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp6_);
 #line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = g_key_file_new ();
+	g_debug ("ui.vala:1971: Saving state to %s", _tmp6_);
 #line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp6_);
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = g_key_file_new ();
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->default_page_width;
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_height;
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_dpi;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->default_page_scan_direction;
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp20_) {
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 9575 "ui.c"
+#line 9679 "ui.c"
 		{
 			GKeyFile* _tmp21_ = NULL;
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = f;
-#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9584 "ui.c"
+#line 9688 "ui.c"
 		}
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 9588 "ui.c"
+#line 9692 "ui.c"
 		{
 			GKeyFile* _tmp22_ = NULL;
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = f;
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9597 "ui.c"
+#line 9701 "ui.c"
 		}
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 9601 "ui.c"
+#line 9705 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9610 "ui.c"
+#line 9714 "ui.c"
 		}
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 9614 "ui.c"
+#line 9718 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9623 "ui.c"
+#line 9727 "ui.c"
 		}
 		default:
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 9628 "ui.c"
+#line 9732 "ui.c"
 	}
 	{
 		gchar* _tmp25_ = NULL;
@@ -9644,27 +9748,27 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = user_interface_get_state_filename (self);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = _tmp25_;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _tmp26_;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = f;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = _tmp29_;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp30_);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp27_);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 9657 "ui.c"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9761 "ui.c"
 			goto __catch25_g_error;
 		}
 	}
@@ -9674,60 +9778,60 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GError* e = NULL;
 		GError* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = e;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_->message;
-#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1999: Failed to write state: %s", _tmp32_);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2001: Failed to write state: %s", _tmp32_);
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 9679 "ui.c"
+#line 9783 "ui.c"
 	}
 	__finally25:
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9692 "ui.c"
+#line 9796 "ui.c"
 	}
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 9696 "ui.c"
+#line 9800 "ui.c"
 }
 
 
-static gboolean ___lambda17_ (UserInterface* self) {
+static gboolean ___lambda18_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9711 "ui.c"
+#line 9815 "ui.c"
 }
 
 
-static gboolean ____lambda17__gsource_func (gpointer self) {
+static gboolean ____lambda18__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda17_ ((UserInterface*) self);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda18_ ((UserInterface*) self);
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9720 "ui.c"
+#line 9824 "ui.c"
 }
 
 
@@ -9750,97 +9854,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 9747 "ui.c"
+#line 9851 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9755 "ui.c"
+#line 9859 "ui.c"
 		}
-#line 2007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 9759 "ui.c"
+#line 9863 "ui.c"
 	}
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda17__gsource_func, g_object_ref (self), g_object_unref);
-#line 9785 "ui.c"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda18__gsource_func, g_object_ref (self), g_object_unref);
+#line 9889 "ui.c"
 	}
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp11_;
 #line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	message = _tmp11_;
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 9809 "ui.c"
+#line 9913 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
 #line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 9821 "ui.c"
+#line 9925 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
 #line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 9833 "ui.c"
+#line 9937 "ui.c"
 }
 
 
@@ -9850,46 +9954,46 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (error_text != NULL);
 #line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (error_text != NULL);
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 9873 "ui.c"
+#line 9977 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
 #line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 9882 "ui.c"
+#line 9986 "ui.c"
 }
 
 
@@ -9904,14 +10008,14 @@ Book* user_interface_get_book (UserInterface* self) {
 	result = _tmp0_;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9897 "ui.c"
+#line 10001 "ui.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? book_ref (self) : NULL;
-#line 9904 "ui.c"
+#line 10008 "ui.c"
 }
 
 
@@ -9930,7 +10034,7 @@ static void user_interface_set_book (UserInterface* self, Book* value) {
 	self->priv->_book = _tmp1_;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "book");
-#line 9923 "ui.c"
+#line 10027 "ui.c"
 }
 
 
@@ -9951,7 +10055,7 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	result = _tmp2_;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9944 "ui.c"
+#line 10048 "ui.c"
 }
 
 
@@ -9968,7 +10072,7 @@ void user_interface_set_selected_page (UserInterface* self, Page* value) {
 	book_view_set_selected_page (_tmp0_, _tmp1_);
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-page");
-#line 9961 "ui.c"
+#line 10065 "ui.c"
 }
 
 
@@ -9983,7 +10087,7 @@ const gchar* user_interface_get_default_file_name (UserInterface* self) {
 	result = _tmp0_;
 #line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9976 "ui.c"
+#line 10080 "ui.c"
 }
 
 
@@ -10002,7 +10106,7 @@ void user_interface_set_default_file_name (UserInterface* self, const gchar* val
 	self->priv->_default_file_name = _tmp1_;
 #line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "default-file-name");
-#line 9995 "ui.c"
+#line 10099 "ui.c"
 }
 
 
@@ -10017,7 +10121,7 @@ gboolean user_interface_get_scanning (UserInterface* self) {
 	result = _tmp0_;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10010 "ui.c"
+#line 10114 "ui.c"
 }
 
 
@@ -10071,7 +10175,7 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) {
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_);
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "scanning");
-#line 10064 "ui.c"
+#line 10168 "ui.c"
 }
 
 
@@ -10092,7 +10196,7 @@ gint user_interface_get_brightness (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10085 "ui.c"
+#line 10189 "ui.c"
 }
 
 
@@ -10109,7 +10213,7 @@ void user_interface_set_brightness (UserInterface* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "brightness");
-#line 10102 "ui.c"
+#line 10206 "ui.c"
 }
 
 
@@ -10130,7 +10234,7 @@ gint user_interface_get_contrast (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10123 "ui.c"
+#line 10227 "ui.c"
 }
 
 
@@ -10147,7 +10251,7 @@ void user_interface_set_contrast (UserInterface* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "contrast");
-#line 10140 "ui.c"
+#line 10244 "ui.c"
 }
 
 
@@ -10168,7 +10272,7 @@ gint user_interface_get_quality (UserInterface* self) {
 	result = (gint) _tmp2_;
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10161 "ui.c"
+#line 10265 "ui.c"
 }
 
 
@@ -10185,7 +10289,7 @@ void user_interface_set_quality (UserInterface* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "quality");
-#line 10178 "ui.c"
+#line 10282 "ui.c"
 }
 
 
@@ -10205,7 +10309,7 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	iter = _tmp1_;
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 10198 "ui.c"
+#line 10302 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
@@ -10219,13 +10323,13 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 		result = device;
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10212 "ui.c"
+#line 10316 "ui.c"
 	}
 #line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
 #line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10218 "ui.c"
+#line 10322 "ui.c"
 }
 
 
@@ -10248,7 +10352,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	if (!_tmp2_) {
 #line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10241 "ui.c"
+#line 10345 "ui.c"
 	}
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
@@ -10260,25 +10364,7 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	self->priv->user_selected_device = TRUE;
 #line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-device");
-#line 10253 "ui.c"
-}
-
-
-static gboolean user_interface_get_shell_shows_menubar (UserInterface* self) {
-	gboolean result;
-	gboolean shell_shows_menubar = FALSE;
-	GtkSettings* _tmp0_ = NULL;
-#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_get ((GObject*) _tmp0_, "gtk-shell-shows-menubar", &shell_shows_menubar, NULL);
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = shell_shows_menubar;
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 10271 "ui.c"
+#line 10357 "ui.c"
 }
 
 
@@ -10286,17 +10372,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10289 "ui.c"
+#line 10375 "ui.c"
 }
 
 
@@ -10315,19 +10401,19 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 		data1 = closure->data;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10308 "ui.c"
+#line 10394 "ui.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 10314 "ui.c"
+#line 10400 "ui.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), value_get_scan_options (param_values + 2), data2);
-#line 10320 "ui.c"
+#line 10406 "ui.c"
 }
 
 
@@ -10346,19 +10432,19 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 		data1 = closure->data;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10339 "ui.c"
+#line 10425 "ui.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 10345 "ui.c"
+#line 10431 "ui.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 10351 "ui.c"
+#line 10437 "ui.c"
 }
 
 
@@ -10584,7 +10670,7 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_window_state_event_cb", G_CALLBACK(_user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "window_delete_event_cb", G_CALLBACK(_user_interface_window_delete_event_cb_gtk_widget_delete_event));
-#line 10577 "ui.c"
+#line 10663 "ui.c"
 }
 
 
@@ -10610,7 +10696,7 @@ static void user_interface_instance_init (UserInterface * self) {
 	self->priv->scanning_ = FALSE;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 10603 "ui.c"
+#line 10689 "ui.c"
 }
 
 
@@ -10784,7 +10870,7 @@ static void user_interface_finalize (GObject* obj) {
 	_g_free0 (self->priv->_default_file_name);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (user_interface_parent_class)->finalize (obj);
-#line 10777 "ui.c"
+#line 10863 "ui.c"
 }
 
 
@@ -10793,7 +10879,7 @@ GType user_interface_get_type (void) {
 	if (g_once_init_enter (&user_interface_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (UserInterfaceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) user_interface_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (UserInterface), 0, (GInstanceInitFunc) user_interface_instance_init, NULL };
 		GType user_interface_type_id;
-		user_interface_type_id = g_type_register_static (GTK_TYPE_APPLICATION_WINDOW, "UserInterface", &g_define_type_info, 0);
+		user_interface_type_id = g_type_register_static (gtk_application_window_get_type (), "UserInterface", &g_define_type_info, 0);
 		g_once_init_leave (&user_interface_type_id__volatile, user_interface_type_id);
 	}
 	return user_interface_type_id__volatile;
@@ -10853,13 +10939,13 @@ static void _vala_user_interface_get_property (GObject * object, guint property_
 		g_value_take_string (value, user_interface_get_selected_device (self));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10846 "ui.c"
+#line 10932 "ui.c"
 		default:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10852 "ui.c"
+#line 10938 "ui.c"
 	}
 }
 
@@ -10917,13 +11003,13 @@ static void _vala_user_interface_set_property (GObject * object, guint property_
 		user_interface_set_selected_device (self, g_value_get_string (value));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10910 "ui.c"
+#line 10996 "ui.c"
 		default:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10916 "ui.c"
+#line 11002 "ui.c"
 	}
 }
 
@@ -10942,92 +11028,92 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
 #line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
 #line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
 #line 2076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
 #line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
 #line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
+#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 11013 "ui.c"
+#line 11099 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 11020 "ui.c"
+#line 11106 "ui.c"
 }
 
 
@@ -11036,36 +11122,36 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11041 "ui.c"
+#line 11127 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
-#line 11058 "ui.c"
+#line 11144 "ui.c"
 }
 
 
@@ -11074,74 +11160,74 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11079 "ui.c"
+#line 11165 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
-#line 11096 "ui.c"
+#line 11182 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_MESSAGE, g_param_spec_string ("message", "message", "message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 11115 "ui.c"
+#line 11201 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 11122 "ui.c"
+#line 11208 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
 #line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
+#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 11134 "ui.c"
+#line 11220 "ui.c"
 }
 
 
@@ -11150,7 +11236,7 @@ GType progress_bar_dialog_get_type (void) {
 	if (g_once_init_enter (&progress_bar_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ProgressBarDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) progress_bar_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ProgressBarDialog), 0, (GInstanceInitFunc) progress_bar_dialog_instance_init, NULL };
 		GType progress_bar_dialog_type_id;
-		progress_bar_dialog_type_id = g_type_register_static (GTK_TYPE_WINDOW, "ProgressBarDialog", &g_define_type_info, 0);
+		progress_bar_dialog_type_id = g_type_register_static (gtk_window_get_type (), "ProgressBarDialog", &g_define_type_info, 0);
 		g_once_init_leave (&progress_bar_dialog_type_id__volatile, progress_bar_dialog_type_id);
 	}
 	return progress_bar_dialog_type_id__volatile;
@@ -11160,27 +11246,27 @@ GType progress_bar_dialog_get_type (void) {
 static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	ProgressBarDialog * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11167 "ui.c"
+#line 11253 "ui.c"
 		default:
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11173 "ui.c"
+#line 11259 "ui.c"
 	}
 }
 
@@ -11188,27 +11274,27 @@ static void _vala_progress_bar_dialog_get_property (GObject * object, guint prop
 static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	ProgressBarDialog * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11195 "ui.c"
+#line 11281 "ui.c"
 		default:
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11201 "ui.c"
+#line 11287 "ui.c"
 	}
 }
 
@@ -11221,45 +11307,45 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 11226 "ui.c"
+#line 11312 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 11245 "ui.c"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 11331 "ui.c"
 			goto __catch26_g_error;
 		}
-#line 2103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 11252 "ui.c"
+#line 11338 "ui.c"
 	}
 	goto __finally26;
 	__catch26_g_error:
@@ -11267,50 +11353,50 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2107: Error saving email attachment: %s", _tmp8_);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2109: Error saving email attachment: %s", _tmp8_);
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 11280 "ui.c"
+#line 11366 "ui.c"
 	}
 	__finally26:
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 11295 "ui.c"
+#line 11381 "ui.c"
 	}
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11303 "ui.c"
+#line 11389 "ui.c"
 }
 
 
@@ -11321,40 +11407,40 @@ PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r,
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
 	gdouble _tmp4_ = 0.0;
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) g_object_new (object_type, NULL);
 #line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) g_object_new (object_type, NULL);
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 11340 "ui.c"
+#line 11426 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 11347 "ui.c"
+#line 11433 "ui.c"
 }
 
 
@@ -11362,23 +11448,23 @@ static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_w
 	PageIcon * self;
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
 #line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 11365 "ui.c"
+#line 11451 "ui.c"
 	}
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 11371 "ui.c"
+#line 11457 "ui.c"
 	}
 }
 
@@ -11388,25 +11474,25 @@ static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gdouble _tmp0_ = 0.0;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
 #line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 11393 "ui.c"
+#line 11479 "ui.c"
 	}
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 11399 "ui.c"
+#line 11485 "ui.c"
 	}
 }
 
@@ -11416,25 +11502,25 @@ static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gint _tmp0_ = 0;
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
 #line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 11421 "ui.c"
+#line 11507 "ui.c"
 	}
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 11427 "ui.c"
+#line 11513 "ui.c"
 	}
 }
 
@@ -11444,25 +11530,25 @@ static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
 	gint _tmp0_ = 0;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (PageIcon*) base;
 #line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 11449 "ui.c"
+#line 11535 "ui.c"
 	}
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 11455 "ui.c"
+#line 11541 "ui.c"
 	}
 }
 
@@ -11505,166 +11591,166 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
 	gdouble _tmp33_ = 0.0;
 	cairo_t* _tmp34_ = NULL;
 	const gchar* _tmp35_ = NULL;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (c != NULL, FALSE);
 #line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (c != NULL, FALSE);
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 11516 "ui.c"
+#line 11602 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
-#line 11525 "ui.c"
+#line 11611 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
-#line 11535 "ui.c"
+#line 11621 "ui.c"
 	}
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
 #line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
 #line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_fill_preserve (_tmp20_);
 #line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_fill_preserve (_tmp20_);
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp27_, ((_tmp28_ - _tmp30_) * 0.5) - 0.5, ((_tmp31_ + _tmp33_) * 0.5) - 0.5);
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	cairo_show_text (_tmp34_, _tmp35_);
 #line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_show_text (_tmp34_, _tmp35_);
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11617 "ui.c"
+#line 11703 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	GTK_WIDGET_CLASS (klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	GTK_WIDGET_CLASS (klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	GTK_WIDGET_CLASS (klass)->get_preferred_height_for_width = page_icon_real_get_preferred_height_for_width;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	GTK_WIDGET_CLASS (klass)->get_preferred_width_for_height = page_icon_real_get_preferred_width_for_height;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	GTK_WIDGET_CLASS (klass)->draw = page_icon_real_draw;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->get_preferred_height_for_width = page_icon_real_get_preferred_height_for_width;
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->get_preferred_width_for_height = page_icon_real_get_preferred_width_for_height;
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 11638 "ui.c"
+#line 11724 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 11645 "ui.c"
+#line 11731 "ui.c"
 }
 
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
 #line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 11657 "ui.c"
+#line 11743 "ui.c"
 }
 
 
@@ -11673,7 +11759,7 @@ GType page_icon_get_type (void) {
 	if (g_once_init_enter (&page_icon_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PageIconClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_icon_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageIcon), 0, (GInstanceInitFunc) page_icon_instance_init, NULL };
 		GType page_icon_type_id;
-		page_icon_type_id = g_type_register_static (GTK_TYPE_DRAWING_AREA, "PageIcon", &g_define_type_info, 0);
+		page_icon_type_id = g_type_register_static (gtk_drawing_area_get_type (), "PageIcon", &g_define_type_info, 0);
 		g_once_init_leave (&page_icon_type_id__volatile, page_icon_type_id);
 	}
 	return page_icon_type_id__volatile;
@@ -11698,4 +11784,16 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 }
 
 
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
+	}
+	return length;
+}
+
+
 
diff --git a/src/ui.vala b/src/ui.vala
index 2117a9a..c12b1cd 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -682,11 +682,10 @@ public class UserInterface : Gtk.ApplicationWindow
                 return true;
             else
                 return false;
-        case Gtk.ResponseType.CANCEL:
-            return false;
         case Gtk.ResponseType.NO:
-        default:
             return true;
+        default:
+            return false;
         }
     }
 
@@ -1660,16 +1659,6 @@ public class UserInterface : Gtk.ApplicationWindow
         copy_to_clipboard_menuitem.sensitive = true;
     }
 
-    private bool shell_shows_menubar
-    {
-        get
-        {
-            bool shell_shows_menubar;
-            Gtk.Settings.get_default ().get ("gtk-shell-shows-menubar", out shell_shows_menubar);
-            return shell_shows_menubar;
-        }
-    }
-
     private void load ()
     {
         Gtk.IconTheme.get_default ().append_search_path (ICON_DIR);
@@ -1678,7 +1667,13 @@ public class UserInterface : Gtk.ApplicationWindow
 
         var app = Application.get_default () as Gtk.Application;
 
-        if (!shell_shows_menubar)
+        if (is_desktop ("Unity") || is_desktop ("XFCE"))
+        {
+            set_titlebar (null);
+            menubar.visible = true;
+            toolbar.visible = true;
+        }
+        else
         {
             app.add_action_entries (action_entries, this);
 
@@ -1717,12 +1712,6 @@ public class UserInterface : Gtk.ApplicationWindow
             app.add_accelerator ("F1", "app.help", null);
             app.add_accelerator ("<Ctrl>Q", "app.quit", null);
         }
-        else
-        {
-            set_titlebar (null);
-            menubar.visible = true;
-            toolbar.visible = true;
-        }
         app.add_window (this);
 
         /* Add InfoBar (not supported in Glade) */
@@ -1867,7 +1856,20 @@ public class UserInterface : Gtk.ApplicationWindow
         progress_dialog = new ProgressBarDialog (this, _("Saving document..."));
         book.saving.connect (book_saving_cb);
     }
-    
+
+    private bool is_desktop (string name)
+    {
+        var desktop_name_list = Environment.get_variable ("XDG_CURRENT_DESKTOP");
+        if (desktop_name_list == null)
+            return false;
+
+        foreach (var n in desktop_name_list.split (":"))
+            if (n == name)
+                return true;
+
+        return false;
+    }
+
     private string state_filename
     {
         owned get { return Path.build_filename (Environment.get_user_cache_dir (), "simple-scan", "state"); }
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-01-19 09:43:17 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-01-19 09:43:17 +0100
commit	d8006d3987034f51ee84f034fb5c9cb33195600d (patch)
tree	6617fbc43905eb346b305fbf4b83968c3ed22721
parent	d09fb0180e126967c94a13b6414694dfb9be313c (diff)