summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-02-16 15:43:46 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-02-16 15:43:46 +0100
commit3ff5cff2dce58296643237f19f410581b24cfce7 (patch)
tree9240925851d1ed93c1bcf3217f923e1eab8c7cd8
parentd8006d3987034f51ee84f034fb5c9cb33195600d (diff)
Imported Upstream version 3.15.90upstream/3.15.90
Diffstat
-rw-r--r--NEWS4
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--po/pl.po10
-rw-r--r--src/autosave-manager.c2
-rw-r--r--src/book-view.c2
-rw-r--r--src/book.c2
-rw-r--r--src/page-view.c2
-rw-r--r--src/page.c2
-rw-r--r--src/scanner.c2
-rw-r--r--src/simple-scan.c2
-rw-r--r--src/ui.c1430
-rw-r--r--src/ui.vala2
13 files changed, 757 insertions, 725 deletions
diff --git a/NEWS b/NEWS
index 8b759c9..53da4e9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.15.90
+
+ * Don't use GtkHeaderBar in LXDE, MATE
+
Overview of changes in simple-scan 3.15.4
* Fix error where document was discarded if warning dialog was closed
diff --git a/configure b/configure
index 7a51cda..ee52fe2 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.4.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.15.90.
#
#
# 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.4'
-PACKAGE_STRING='simple-scan 3.15.4'
+PACKAGE_VERSION='3.15.90'
+PACKAGE_STRING='simple-scan 3.15.90'
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.4 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.15.90 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.4:";;
+ short | recursive ) echo "Configuration of simple-scan 3.15.90:";;
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.4
+simple-scan configure 3.15.90
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.4, which was
+It was created by simple-scan $as_me 3.15.90, 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.4'
+ VERSION='3.15.90'
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.4, which was
+This file was extended by simple-scan $as_me 3.15.90, 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.4
+simple-scan config.status 3.15.90
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 5b9a9f1..213d6e7 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.4)
+AC_INIT(simple-scan, 3.15.90)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE
diff --git a/po/pl.po b/po/pl.po
index d79cdd7..eefa637 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: simple-scan\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2015-01-15 10:02+1300\n"
-"PO-Revision-Date: 2014-07-06 15:24+0000\n"
+"PO-Revision-Date: 2015-01-21 16:34+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
-"X-Generator: Launchpad (build 17303)\n"
+"X-Launchpad-Export-Date: 2015-01-22 05:44+0000\n"
+"X-Generator: Launchpad (build 17306)\n"
#. Button to submit authorization dialog
#: ../data/simple-scan.ui.h:2
@@ -293,7 +293,7 @@ msgstr "Jakość:"
#: ../data/simple-scan.desktop.in.h:2
msgid "Document Scanner"
-msgstr ""
+msgstr "Skaner dokumentów"
#: ../data/simple-scan.desktop.in.h:3
msgid "Scan Documents"
@@ -301,7 +301,7 @@ msgstr "Skanowanie dokumentów"
#: ../data/simple-scan.desktop.in.h:4
msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
msgid "Device to scan from"
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 180f22a..3c36bfe 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.26.1, the Vala compiler
+/* autosave-manager.c generated by valac 0.26.2, the Vala compiler
* generated from autosave-manager.vala, do not modify */
/*
diff --git a/src/book-view.c b/src/book-view.c
index dbfdba3..7c44f03 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.26.1, the Vala compiler
+/* book-view.c generated by valac 0.26.2, the Vala compiler
* generated from book-view.vala, do not modify */
/*
diff --git a/src/book.c b/src/book.c
index 8bfd63a..d25c072 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.26.1, the Vala compiler
+/* book.c generated by valac 0.26.2, the Vala compiler
* generated from book.vala, do not modify */
/*
diff --git a/src/page-view.c b/src/page-view.c
index 1d9bea1..a5377dd 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.26.1, the Vala compiler
+/* page-view.c generated by valac 0.26.2, the Vala compiler
* generated from page-view.vala, do not modify */
/*
diff --git a/src/page.c b/src/page.c
index 8e47fa2..417f870 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.26.1, the Vala compiler
+/* page.c generated by valac 0.26.2, the Vala compiler
* generated from page.vala, do not modify */
/*
diff --git a/src/scanner.c b/src/scanner.c
index 0084b71..d32dcd9 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.26.1, the Vala compiler
+/* scanner.c generated by valac 0.26.2, the Vala compiler
* generated from scanner.vala, do not modify */
/*
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 3036fc9..f474954 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.26.1, the Vala compiler
+/* simple-scan.c generated by valac 0.26.2, the Vala compiler
* generated from simple-scan.vala, do not modify */
/*
diff --git a/src/ui.c b/src/ui.c
index 2bfb29a..ce60257 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.26.1, the Vala compiler
+/* ui.c generated by valac 0.26.2, the Vala compiler
* generated from ui.vala, do not modify */
/*
@@ -7886,47 +7886,45 @@ static void user_interface_load (UserInterface* self) {
GtkApplication* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
gboolean _tmp4_ = FALSE;
- GtkApplication* _tmp55_ = NULL;
- GtkInfoBar* _tmp56_ = NULL;
- GtkInfoBar* _tmp57_ = NULL;
- GtkBox* _tmp58_ = NULL;
- GtkInfoBar* _tmp59_ = NULL;
+ gboolean _tmp5_ = FALSE;
+ gboolean _tmp6_ = FALSE;
+ GtkApplication* _tmp59_ = NULL;
+ GtkInfoBar* _tmp60_ = NULL;
+ GtkInfoBar* _tmp61_ = NULL;
+ GtkBox* _tmp62_ = NULL;
+ GtkInfoBar* _tmp63_ = NULL;
GtkBox* hbox = NULL;
- GtkBox* _tmp60_ = NULL;
+ GtkBox* _tmp64_ = NULL;
GtkContainer* content_area = NULL;
- GtkInfoBar* _tmp61_ = NULL;
- GtkContainer* _tmp62_ = NULL;
- GtkContainer* _tmp63_ = NULL;
- GtkContainer* _tmp64_ = NULL;
- GtkBox* _tmp65_ = NULL;
- GtkBox* _tmp66_ = NULL;
- GtkImage* _tmp67_ = NULL;
- GtkBox* _tmp68_ = NULL;
- GtkImage* _tmp69_ = NULL;
- GtkImage* _tmp70_ = NULL;
- GtkLabel* _tmp71_ = NULL;
- GtkLabel* _tmp72_ = NULL;
- GtkBox* _tmp73_ = NULL;
- GtkLabel* _tmp74_ = NULL;
+ GtkInfoBar* _tmp65_ = NULL;
+ GtkContainer* _tmp66_ = NULL;
+ GtkContainer* _tmp67_ = NULL;
+ GtkContainer* _tmp68_ = NULL;
+ GtkBox* _tmp69_ = NULL;
+ GtkBox* _tmp70_ = NULL;
+ GtkImage* _tmp71_ = NULL;
+ GtkBox* _tmp72_ = NULL;
+ GtkImage* _tmp73_ = NULL;
+ GtkImage* _tmp74_ = NULL;
GtkLabel* _tmp75_ = NULL;
- GtkInfoBar* _tmp76_ = NULL;
- const gchar* _tmp77_ = NULL;
- GtkButton* _tmp78_ = NULL;
- GtkButton* _tmp79_ = NULL;
+ GtkLabel* _tmp76_ = NULL;
+ GtkBox* _tmp77_ = NULL;
+ GtkLabel* _tmp78_ = NULL;
+ GtkLabel* _tmp79_ = NULL;
GtkInfoBar* _tmp80_ = NULL;
const gchar* _tmp81_ = NULL;
GtkButton* _tmp82_ = NULL;
GtkButton* _tmp83_ = NULL;
+ GtkInfoBar* _tmp84_ = NULL;
+ const gchar* _tmp85_ = NULL;
+ GtkButton* _tmp86_ = NULL;
+ GtkButton* _tmp87_ = NULL;
GtkTreeIter iter = {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* _tmp88_ = NULL;
+ GtkTreeIter _tmp89_ = {0};
+ GtkListStore* _tmp90_ = NULL;
+ GtkTreeIter _tmp91_ = {0};
+ const gchar* _tmp92_ = NULL;
GtkListStore* _tmp93_ = NULL;
GtkTreeIter _tmp94_ = {0};
GtkListStore* _tmp95_ = NULL;
@@ -7947,142 +7945,146 @@ static void user_interface_load (UserInterface* self) {
GtkTreeIter _tmp110_ = {0};
GtkListStore* _tmp111_ = NULL;
GtkTreeIter _tmp112_ = {0};
+ GtkListStore* _tmp113_ = NULL;
+ GtkTreeIter _tmp114_ = {0};
+ GtkListStore* _tmp115_ = NULL;
+ GtkTreeIter _tmp116_ = {0};
gint dpi = 0;
- GSettings* _tmp113_ = NULL;
- gint _tmp114_ = 0;
- gint _tmp115_ = 0;
- GtkComboBox* _tmp116_ = NULL;
- gint _tmp117_ = 0;
- GtkComboBox* _tmp118_ = NULL;
- GSettings* _tmp119_ = NULL;
- gint _tmp120_ = 0;
+ GSettings* _tmp117_ = NULL;
+ gint _tmp118_ = 0;
+ gint _tmp119_ = 0;
+ GtkComboBox* _tmp120_ = NULL;
gint _tmp121_ = 0;
GtkComboBox* _tmp122_ = NULL;
- gint _tmp123_ = 0;
- GtkComboBox* _tmp124_ = NULL;
- GtkCellRendererText* renderer = NULL;
- GtkCellRendererText* _tmp125_ = NULL;
+ GSettings* _tmp123_ = NULL;
+ gint _tmp124_ = 0;
+ gint _tmp125_ = 0;
GtkComboBox* _tmp126_ = NULL;
- GtkCellRendererText* _tmp127_ = NULL;
+ gint _tmp127_ = 0;
GtkComboBox* _tmp128_ = NULL;
+ GtkCellRendererText* renderer = NULL;
GtkCellRendererText* _tmp129_ = NULL;
- GtkCellRendererText* _tmp130_ = NULL;
- GtkComboBox* _tmp131_ = NULL;
- GtkCellRendererText* _tmp132_ = NULL;
- GtkComboBox* _tmp133_ = NULL;
+ GtkComboBox* _tmp130_ = NULL;
+ GtkCellRendererText* _tmp131_ = NULL;
+ GtkComboBox* _tmp132_ = NULL;
+ GtkCellRendererText* _tmp133_ = NULL;
GtkCellRendererText* _tmp134_ = NULL;
- GSettings* _tmp135_ = NULL;
- gint _tmp136_ = 0;
+ GtkComboBox* _tmp135_ = NULL;
+ GtkCellRendererText* _tmp136_ = NULL;
GtkComboBox* _tmp137_ = NULL;
GtkCellRendererText* _tmp138_ = NULL;
- GtkComboBox* _tmp139_ = NULL;
- GtkCellRendererText* _tmp140_ = NULL;
+ GSettings* _tmp139_ = NULL;
+ gint _tmp140_ = 0;
GtkComboBox* _tmp141_ = NULL;
GtkCellRendererText* _tmp142_ = NULL;
+ GtkComboBox* _tmp143_ = NULL;
+ GtkCellRendererText* _tmp144_ = NULL;
+ GtkComboBox* _tmp145_ = NULL;
+ GtkCellRendererText* _tmp146_ = NULL;
gint paper_width = 0;
- GSettings* _tmp143_ = NULL;
- gint _tmp144_ = 0;
- gint paper_height = 0;
- GSettings* _tmp145_ = NULL;
- gint _tmp146_ = 0;
- gint _tmp147_ = 0;
+ GSettings* _tmp147_ = NULL;
gint _tmp148_ = 0;
- GtkComboBox* _tmp149_ = NULL;
+ gint paper_height = 0;
+ GSettings* _tmp149_ = NULL;
+ gint _tmp150_ = 0;
+ gint _tmp151_ = 0;
+ gint _tmp152_ = 0;
+ GtkComboBox* _tmp153_ = NULL;
gdouble lower = 0.0;
- GtkAdjustment* _tmp150_ = NULL;
- gdouble _tmp151_ = 0.0;
- gdouble _tmp152_ = 0.0;
+ GtkAdjustment* _tmp154_ = NULL;
+ gdouble _tmp155_ = 0.0;
+ gdouble _tmp156_ = 0.0;
gchar* darker_label = NULL;
- const gchar* _tmp153_ = NULL;
- gchar* _tmp154_ = NULL;
+ const gchar* _tmp157_ = NULL;
+ gchar* _tmp158_ = NULL;
gdouble upper = 0.0;
- GtkAdjustment* _tmp155_ = NULL;
- gdouble _tmp156_ = 0.0;
- gdouble _tmp157_ = 0.0;
- gchar* lighter_label = NULL;
- const gchar* _tmp158_ = NULL;
- gchar* _tmp159_ = NULL;
- GtkScale* _tmp160_ = NULL;
+ GtkAdjustment* _tmp159_ = NULL;
+ gdouble _tmp160_ = 0.0;
gdouble _tmp161_ = 0.0;
+ gchar* lighter_label = NULL;
const gchar* _tmp162_ = NULL;
- GtkScale* _tmp163_ = NULL;
+ gchar* _tmp163_ = NULL;
GtkScale* _tmp164_ = NULL;
gdouble _tmp165_ = 0.0;
const gchar* _tmp166_ = NULL;
- GSettings* _tmp167_ = NULL;
- gint _tmp168_ = 0;
- GtkAdjustment* _tmp169_ = NULL;
- GtkAdjustment* _tmp170_ = NULL;
- gdouble _tmp171_ = 0.0;
- gdouble _tmp172_ = 0.0;
- gchar* less_label = NULL;
- const gchar* _tmp173_ = NULL;
- gchar* _tmp174_ = NULL;
- GtkAdjustment* _tmp175_ = NULL;
+ GtkScale* _tmp167_ = NULL;
+ GtkScale* _tmp168_ = NULL;
+ gdouble _tmp169_ = 0.0;
+ const gchar* _tmp170_ = NULL;
+ GSettings* _tmp171_ = NULL;
+ gint _tmp172_ = 0;
+ GtkAdjustment* _tmp173_ = NULL;
+ GtkAdjustment* _tmp174_ = NULL;
+ gdouble _tmp175_ = 0.0;
gdouble _tmp176_ = 0.0;
- gdouble _tmp177_ = 0.0;
- gchar* more_label = NULL;
- const gchar* _tmp178_ = NULL;
- gchar* _tmp179_ = NULL;
- GtkScale* _tmp180_ = NULL;
+ gchar* less_label = NULL;
+ const gchar* _tmp177_ = NULL;
+ gchar* _tmp178_ = NULL;
+ GtkAdjustment* _tmp179_ = NULL;
+ gdouble _tmp180_ = 0.0;
gdouble _tmp181_ = 0.0;
+ gchar* more_label = NULL;
const gchar* _tmp182_ = NULL;
- GtkScale* _tmp183_ = NULL;
+ gchar* _tmp183_ = NULL;
GtkScale* _tmp184_ = NULL;
gdouble _tmp185_ = 0.0;
const gchar* _tmp186_ = NULL;
- GSettings* _tmp187_ = NULL;
- gint _tmp188_ = 0;
- GtkAdjustment* _tmp189_ = NULL;
- GtkAdjustment* _tmp190_ = NULL;
- gdouble _tmp191_ = 0.0;
- gdouble _tmp192_ = 0.0;
- gchar* minimum_label = NULL;
- const gchar* _tmp193_ = NULL;
- gchar* _tmp194_ = NULL;
- GtkAdjustment* _tmp195_ = NULL;
+ GtkScale* _tmp187_ = NULL;
+ GtkScale* _tmp188_ = NULL;
+ gdouble _tmp189_ = 0.0;
+ const gchar* _tmp190_ = NULL;
+ GSettings* _tmp191_ = NULL;
+ gint _tmp192_ = 0;
+ GtkAdjustment* _tmp193_ = NULL;
+ GtkAdjustment* _tmp194_ = NULL;
+ gdouble _tmp195_ = 0.0;
gdouble _tmp196_ = 0.0;
- gdouble _tmp197_ = 0.0;
- gchar* maximum_label = NULL;
- const gchar* _tmp198_ = NULL;
- gchar* _tmp199_ = NULL;
- GtkScale* _tmp200_ = NULL;
+ gchar* minimum_label = NULL;
+ const gchar* _tmp197_ = NULL;
+ gchar* _tmp198_ = NULL;
+ GtkAdjustment* _tmp199_ = NULL;
+ gdouble _tmp200_ = 0.0;
gdouble _tmp201_ = 0.0;
+ gchar* maximum_label = NULL;
const gchar* _tmp202_ = NULL;
- GtkScale* _tmp203_ = NULL;
+ gchar* _tmp203_ = NULL;
GtkScale* _tmp204_ = NULL;
gdouble _tmp205_ = 0.0;
const gchar* _tmp206_ = NULL;
- GSettings* _tmp207_ = NULL;
- gint _tmp208_ = 0;
- GtkAdjustment* _tmp209_ = NULL;
+ GtkScale* _tmp207_ = NULL;
+ GtkScale* _tmp208_ = NULL;
+ gdouble _tmp209_ = 0.0;
+ const gchar* _tmp210_ = NULL;
+ GSettings* _tmp211_ = NULL;
+ gint _tmp212_ = 0;
+ GtkAdjustment* _tmp213_ = NULL;
gchar* device = NULL;
- GSettings* _tmp210_ = NULL;
- gchar* _tmp211_ = NULL;
- const gchar* _tmp212_ = NULL;
+ GSettings* _tmp214_ = NULL;
+ gchar* _tmp215_ = NULL;
+ const gchar* _tmp216_ = NULL;
gchar* document_type = NULL;
- GSettings* _tmp218_ = NULL;
- gchar* _tmp219_ = NULL;
- const gchar* _tmp220_ = NULL;
- Book* _tmp222_ = NULL;
- BookView* _tmp223_ = NULL;
- BookView* _tmp224_ = NULL;
- GtkBox* _tmp225_ = NULL;
- BookView* _tmp226_ = NULL;
+ GSettings* _tmp222_ = NULL;
+ gchar* _tmp223_ = NULL;
+ const gchar* _tmp224_ = NULL;
+ Book* _tmp226_ = NULL;
BookView* _tmp227_ = NULL;
BookView* _tmp228_ = NULL;
- BookView* _tmp229_ = NULL;
+ GtkBox* _tmp229_ = NULL;
BookView* _tmp230_ = NULL;
- GtkDialog* _tmp231_ = NULL;
- GtkDialog* _tmp232_ = NULL;
- gint _tmp233_ = 0;
- gint _tmp234_ = 0;
- gint _tmp235_ = 0;
- gint _tmp236_ = 0;
- gboolean _tmp237_ = FALSE;
- const gchar* _tmp238_ = NULL;
- ProgressBarDialog* _tmp239_ = NULL;
- Book* _tmp240_ = NULL;
+ BookView* _tmp231_ = NULL;
+ BookView* _tmp232_ = NULL;
+ BookView* _tmp233_ = NULL;
+ BookView* _tmp234_ = NULL;
+ GtkDialog* _tmp235_ = NULL;
+ GtkDialog* _tmp236_ = NULL;
+ gint _tmp237_ = 0;
+ gint _tmp238_ = 0;
+ gint _tmp239_ = 0;
+ gint _tmp240_ = 0;
+ gboolean _tmp241_ = FALSE;
+ const gchar* _tmp242_ = NULL;
+ ProgressBarDialog* _tmp243_ = NULL;
+ Book* _tmp244_ = NULL;
#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_return_if_fail (self != NULL);
#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -8098,58 +8100,80 @@ static void user_interface_load (UserInterface* self) {
#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
app = _tmp2_;
#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp4_ = user_interface_is_desktop (self, "Unity");
+ _tmp6_ = user_interface_is_desktop (self, "Unity");
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ if (_tmp6_) {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ _tmp5_ = TRUE;
+#line 8098 "ui.c"
+ } else {
+ gboolean _tmp7_ = FALSE;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ _tmp7_ = user_interface_is_desktop (self, "XFCE");
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ _tmp5_ = _tmp7_;
+#line 8105 "ui.c"
+ }
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ if (_tmp5_) {
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ _tmp4_ = TRUE;
+#line 8111 "ui.c"
+ } else {
+ gboolean _tmp8_ = FALSE;
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ _tmp8_ = user_interface_is_desktop (self, "MATE");
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+ _tmp4_ = _tmp8_;
+#line 8118 "ui.c"
+ }
#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"
+#line 8124 "ui.c"
} else {
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp9_ = FALSE;
#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp5_ = user_interface_is_desktop (self, "XFCE");
+ _tmp9_ = user_interface_is_desktop (self, "LXDE");
#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp3_ = _tmp5_;
-#line 8103 "ui.c"
+ _tmp3_ = _tmp9_;
+#line 8131 "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 8135 "ui.c"
+ GtkMenuBar* _tmp10_ = NULL;
+ GtkToolbar* _tmp11_ = 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;
+ _tmp10_ = self->priv->menubar;
#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+ gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp7_ = self->priv->toolbar;
+ _tmp11_ = 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"
+ gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
+#line 8148 "ui.c"
} else {
- GtkApplication* _tmp8_ = NULL;
+ GtkApplication* _tmp12_ = NULL;
GMenu* appmenu = NULL;
- GMenu* _tmp9_ = NULL;
- GMenu* section = NULL;
- GMenu* _tmp10_ = NULL;
- GMenu* _tmp11_ = NULL;
- GMenu* _tmp12_ = NULL;
GMenu* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+ GMenu* section = NULL;
+ GMenu* _tmp14_ = NULL;
GMenu* _tmp15_ = NULL;
GMenu* _tmp16_ = NULL;
GMenu* _tmp17_ = NULL;
- GMenu* menu = NULL;
- GMenu* _tmp18_ = NULL;
+ const gchar* _tmp18_ = NULL;
GMenu* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
+ GMenu* _tmp20_ = NULL;
GMenu* _tmp21_ = NULL;
+ GMenu* menu = NULL;
GMenu* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- GMenu* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
+ GMenu* _tmp23_ = NULL;
+ const gchar* _tmp24_ = NULL;
+ GMenu* _tmp25_ = NULL;
GMenu* _tmp26_ = NULL;
const gchar* _tmp27_ = NULL;
GMenu* _tmp28_ = NULL;
@@ -8157,838 +8181,842 @@ static void user_interface_load (UserInterface* self) {
GMenu* _tmp30_ = NULL;
const gchar* _tmp31_ = NULL;
GMenu* _tmp32_ = NULL;
- GMenu* _tmp33_ = NULL;
+ const gchar* _tmp33_ = NULL;
GMenu* _tmp34_ = NULL;
- GMenu* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
+ const gchar* _tmp35_ = NULL;
+ GMenu* _tmp36_ = NULL;
GMenu* _tmp37_ = NULL;
GMenu* _tmp38_ = NULL;
GMenu* _tmp39_ = NULL;
- GMenu* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
+ const gchar* _tmp40_ = NULL;
+ GMenu* _tmp41_ = NULL;
GMenu* _tmp42_ = NULL;
- const gchar* _tmp43_ = NULL;
+ GMenu* _tmp43_ = NULL;
GMenu* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
- GtkApplication* _tmp46_ = NULL;
- GMenu* _tmp47_ = NULL;
- GtkApplication* _tmp48_ = NULL;
- GtkApplication* _tmp49_ = NULL;
+ GMenu* _tmp46_ = NULL;
+ const gchar* _tmp47_ = NULL;
+ GMenu* _tmp48_ = NULL;
+ const gchar* _tmp49_ = NULL;
GtkApplication* _tmp50_ = NULL;
- GtkApplication* _tmp51_ = NULL;
+ GMenu* _tmp51_ = NULL;
GtkApplication* _tmp52_ = NULL;
GtkApplication* _tmp53_ = NULL;
GtkApplication* _tmp54_ = NULL;
+ GtkApplication* _tmp55_ = NULL;
+ GtkApplication* _tmp56_ = NULL;
+ GtkApplication* _tmp57_ = NULL;
+ GtkApplication* _tmp58_ = NULL;
#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp8_ = app;
+ _tmp12_ = 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);
+ g_action_map_add_action_entries ((GActionMap*) _tmp12_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp9_ = g_menu_new ();
+ _tmp13_ = g_menu_new ();
#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- appmenu = _tmp9_;
+ appmenu = _tmp13_;
#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp10_ = g_menu_new ();
+ _tmp14_ = g_menu_new ();
#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- section = _tmp10_;
+ section = _tmp14_;
#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp11_ = appmenu;
+ _tmp15_ = appmenu;
#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp12_ = section;
+ _tmp16_ = section;
#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append_section (_tmp11_, NULL, (GMenuModel*) _tmp12_);
+ g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp13_ = section;
+ _tmp17_ = section;
#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp14_ = _ ("New Document");
+ _tmp18_ = _ ("New Document");
#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp13_, _tmp14_, "app.new_document");
+ g_menu_append (_tmp17_, _tmp18_, "app.new_document");
#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp15_ = g_menu_new ();
+ _tmp19_ = g_menu_new ();
#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_object_unref0 (section);
#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- section = _tmp15_;
+ section = _tmp19_;
#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp16_ = appmenu;
+ _tmp20_ = appmenu;
#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp17_ = section;
+ _tmp21_ = section;
#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append_section (_tmp16_, NULL, (GMenuModel*) _tmp17_);
+ g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp18_ = g_menu_new ();
+ _tmp22_ = g_menu_new ();
#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- menu = _tmp18_;
+ menu = _tmp22_;
#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp19_ = section;
+ _tmp23_ = section;
#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp20_ = _ ("Document");
+ _tmp24_ = _ ("Document");
#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp21_ = menu;
+ _tmp25_ = menu;
#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append_submenu (_tmp19_, _tmp20_, (GMenuModel*) _tmp21_);
+ g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp22_ = menu;
+ _tmp26_ = menu;
#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp23_ = _ ("Reorder Pages");
+ _tmp27_ = _ ("Reorder Pages");
#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp22_, _tmp23_, "app.reorder");
+ g_menu_append (_tmp26_, _tmp27_, "app.reorder");
#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp24_ = menu;
+ _tmp28_ = menu;
#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp25_ = _ ("Save");
+ _tmp29_ = _ ("Save");
#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp24_, _tmp25_, "app.save");
+ g_menu_append (_tmp28_, _tmp29_, "app.save");
#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp26_ = menu;
+ _tmp30_ = menu;
#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp27_ = _ ("Save As...");
+ _tmp31_ = _ ("Save As...");
#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp26_, _tmp27_, "app.save_as");
+ g_menu_append (_tmp30_, _tmp31_, "app.save_as");
#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp28_ = menu;
+ _tmp32_ = menu;
#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp29_ = _ ("Email...");
+ _tmp33_ = _ ("Email...");
#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp28_, _tmp29_, "app.email");
+ g_menu_append (_tmp32_, _tmp33_, "app.email");
#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp30_ = menu;
+ _tmp34_ = menu;
#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp31_ = _ ("Print...");
+ _tmp35_ = _ ("Print...");
#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp30_, _tmp31_, "app.print");
+ g_menu_append (_tmp34_, _tmp35_, "app.print");
#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp32_ = g_menu_new ();
+ _tmp36_ = g_menu_new ();
#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_object_unref0 (section);
#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- section = _tmp32_;
+ section = _tmp36_;
#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp33_ = appmenu;
+ _tmp37_ = appmenu;
#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp34_ = section;
+ _tmp38_ = section;
#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append_section (_tmp33_, NULL, (GMenuModel*) _tmp34_);
+ g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp35_ = section;
+ _tmp39_ = section;
#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp36_ = _ ("Preferences");
+ _tmp40_ = _ ("Preferences");
#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp35_, _tmp36_, "app.preferences");
+ g_menu_append (_tmp39_, _tmp40_, "app.preferences");
#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp37_ = g_menu_new ();
+ _tmp41_ = 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_;
+ section = _tmp41_;
#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp38_ = appmenu;
+ _tmp42_ = appmenu;
#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp39_ = section;
+ _tmp43_ = section;
#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append_section (_tmp38_, NULL, (GMenuModel*) _tmp39_);
+ g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp40_ = section;
+ _tmp44_ = section;
#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp41_ = _ ("Help");
+ _tmp45_ = _ ("Help");
#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp40_, _tmp41_, "app.help");
+ g_menu_append (_tmp44_, _tmp45_, "app.help");
#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp42_ = section;
+ _tmp46_ = section;
#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp43_ = _ ("About");
+ _tmp47_ = _ ("About");
#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp42_, _tmp43_, "app.about");
+ g_menu_append (_tmp46_, _tmp47_, "app.about");
#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp44_ = section;
+ _tmp48_ = section;
#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp45_ = _ ("Quit");
+ _tmp49_ = _ ("Quit");
#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_menu_append (_tmp44_, _tmp45_, "app.quit");
+ g_menu_append (_tmp48_, _tmp49_, "app.quit");
#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp46_ = app;
+ _tmp50_ = app;
#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp47_ = appmenu;
+ _tmp51_ = appmenu;
#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_set_app_menu (_tmp46_, (GMenuModel*) _tmp47_);
+ gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp48_ = app;
+ _tmp52_ = app;
#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp48_, "<Ctrl>N", "app.new_document", NULL);
+ gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp49_ = app;
+ _tmp53_ = app;
#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp49_, "<Ctrl>S", "app.save", NULL);
+ gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp50_ = app;
+ _tmp54_ = app;
#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp50_, "<Shift><Ctrl>S", "app.save_as", NULL);
+ gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp51_ = app;
+ _tmp55_ = app;
#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp51_, "<Ctrl>E", "app.email", NULL);
+ gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp52_ = app;
+ _tmp56_ = app;
#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp52_, "<Ctrl>P", "app.print", NULL);
+ gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp53_ = app;
+ _tmp57_ = app;
#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp53_, "F1", "app.help", NULL);
+ gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp54_ = app;
+ _tmp58_ = app;
#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_accelerator (_tmp54_, "<Ctrl>Q", "app.quit", NULL);
+ gtk_application_add_accelerator (_tmp58_, "<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 8366 "ui.c"
}
#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp55_ = app;
+ _tmp59_ = app;
#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_application_add_window (_tmp55_, (GtkWindow*) self);
+ gtk_application_add_window (_tmp59_, (GtkWindow*) self);
#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp56_ = (GtkInfoBar*) gtk_info_bar_new ();
+ _tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp56_);
+ g_object_ref_sink (_tmp60_);
#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_;
+ self->priv->info_bar = _tmp60_;
#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp57_ = self->priv->info_bar;
+ _tmp61_ = 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);
+ g_signal_connect_object (_tmp61_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp58_ = self->priv->main_vbox;
+ _tmp62_ = self->priv->main_vbox;
#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp59_ = self->priv->info_bar;
+ _tmp63_ = 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);
+ gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp60_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+ _tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp60_);
+ g_object_ref_sink (_tmp64_);
#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- hbox = _tmp60_;
+ hbox = _tmp64_;
#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp61_ = self->priv->info_bar;
+ _tmp65_ = self->priv->info_bar;
#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp62_ = gtk_info_bar_get_content_area (_tmp61_);
+ _tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
#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);
+ _tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp66_) : NULL);
#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- content_area = _tmp63_;
+ content_area = _tmp67_;
#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp64_ = content_area;
+ _tmp68_ = content_area;
#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp65_ = hbox;
+ _tmp69_ = hbox;
#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_container_add (_tmp64_, (GtkWidget*) _tmp65_);
+ gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp66_ = hbox;
+ _tmp70_ = hbox;
#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_widget_set_visible ((GtkWidget*) _tmp66_, TRUE);
+ gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp67_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
+ _tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp67_);
+ g_object_ref_sink (_tmp71_);
#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_;
+ self->priv->info_bar_image = _tmp71_;
#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp68_ = hbox;
+ _tmp72_ = hbox;
#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp69_ = self->priv->info_bar_image;
+ _tmp73_ = 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);
+ gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp70_ = self->priv->info_bar_image;
+ _tmp74_ = self->priv->info_bar_image;
#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
+ gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp71_ = (GtkLabel*) gtk_label_new (NULL);
+ _tmp75_ = (GtkLabel*) gtk_label_new (NULL);
#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp71_);
+ g_object_ref_sink (_tmp75_);
#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_;
+ self->priv->info_bar_label = _tmp75_;
#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp72_ = self->priv->info_bar_label;
+ _tmp76_ = self->priv->info_bar_label;
#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_misc_set_alignment ((GtkMisc*) _tmp72_, 0.0f, 0.5f);
+ gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp73_ = hbox;
+ _tmp77_ = hbox;
#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp74_ = self->priv->info_bar_label;
+ _tmp78_ = self->priv->info_bar_label;
#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_box_pack_start (_tmp73_, (GtkWidget*) _tmp74_, TRUE, TRUE, (guint) 0);
+ gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp75_ = self->priv->info_bar_label;
+ _tmp79_ = self->priv->info_bar_label;
#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_widget_set_visible ((GtkWidget*) _tmp75_, TRUE);
+ gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp76_ = self->priv->info_bar;
+ _tmp80_ = self->priv->info_bar;
#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp77_ = _ ("_Close");
+ _tmp81_ = _ ("_Close");
#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp78_ = gtk_info_bar_add_button (_tmp76_, _tmp77_, (gint) GTK_RESPONSE_CLOSE);
+ _tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (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);
+ _tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_button_get_type ()) ? ((GtkButton*) _tmp82_) : 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_;
+ self->priv->info_bar_close_button = _tmp83_;
#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp80_ = self->priv->info_bar;
+ _tmp84_ = self->priv->info_bar;
#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp81_ = _ ("Change _Scanner");
+ _tmp85_ = _ ("Change _Scanner");
#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, 1);
+ _tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 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);
+ _tmp87_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp86_, gtk_button_get_type ()) ? ((GtkButton*) _tmp86_) : 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_;
+ self->priv->info_bar_change_scanner_button = _tmp87_;
#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp84_ = self->priv->paper_size_model;
+ _tmp88_ = self->priv->paper_size_model;
#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp84_, &_tmp85_);
+ gtk_list_store_append (_tmp88_, &_tmp89_);
#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp85_;
+ iter = _tmp89_;
#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp86_ = self->priv->paper_size_model;
+ _tmp90_ = self->priv->paper_size_model;
#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp87_ = iter;
+ _tmp91_ = iter;
#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp88_ = _ ("Automatic");
+ _tmp92_ = _ ("Automatic");
#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_set (_tmp86_, &_tmp87_, 0, 0, 1, 0, 2, _tmp88_, -1, -1);
+ gtk_list_store_set (_tmp90_, &_tmp91_, 0, 0, 1, 0, 2, _tmp92_, -1, -1);
#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp89_ = self->priv->paper_size_model;
+ _tmp93_ = self->priv->paper_size_model;
#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp89_, &_tmp90_);
+ gtk_list_store_append (_tmp93_, &_tmp94_);
#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp90_;
+ iter = _tmp94_;
#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp91_ = self->priv->paper_size_model;
+ _tmp95_ = self->priv->paper_size_model;
#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp92_ = iter;
+ _tmp96_ = 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);
+ gtk_list_store_set (_tmp95_, &_tmp96_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp93_ = self->priv->paper_size_model;
+ _tmp97_ = self->priv->paper_size_model;
#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp93_, &_tmp94_);
+ gtk_list_store_append (_tmp97_, &_tmp98_);
#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp94_;
+ iter = _tmp98_;
#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp95_ = self->priv->paper_size_model;
+ _tmp99_ = self->priv->paper_size_model;
#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp96_ = iter;
+ _tmp100_ = iter;
#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_set (_tmp95_, &_tmp96_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+ gtk_list_store_set (_tmp99_, &_tmp100_, 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;
+ _tmp101_ = self->priv->paper_size_model;
#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp97_, &_tmp98_);
+ gtk_list_store_append (_tmp101_, &_tmp102_);
#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp98_;
+ iter = _tmp102_;
#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp99_ = self->priv->paper_size_model;
+ _tmp103_ = self->priv->paper_size_model;
#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp100_ = iter;
+ _tmp104_ = 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);
+ gtk_list_store_set (_tmp103_, &_tmp104_, 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;
+ _tmp105_ = self->priv->paper_size_model;
#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp101_, &_tmp102_);
+ gtk_list_store_append (_tmp105_, &_tmp106_);
#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp102_;
+ iter = _tmp106_;
#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp103_ = self->priv->paper_size_model;
+ _tmp107_ = self->priv->paper_size_model;
#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp104_ = iter;
+ _tmp108_ = iter;
#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_set (_tmp103_, &_tmp104_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
+ gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp105_ = self->priv->paper_size_model;
+ _tmp109_ = self->priv->paper_size_model;
#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp105_, &_tmp106_);
+ gtk_list_store_append (_tmp109_, &_tmp110_);
#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp106_;
+ iter = _tmp110_;
#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp107_ = self->priv->paper_size_model;
+ _tmp111_ = self->priv->paper_size_model;
#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp108_ = iter;
+ _tmp112_ = 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);
+ gtk_list_store_set (_tmp111_, &_tmp112_, 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;
+ _tmp113_ = self->priv->paper_size_model;
#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_append (_tmp109_, &_tmp110_);
+ gtk_list_store_append (_tmp113_, &_tmp114_);
#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp110_;
+ iter = _tmp114_;
#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp111_ = self->priv->paper_size_model;
+ _tmp115_ = self->priv->paper_size_model;
#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp112_ = iter;
+ _tmp116_ = iter;
#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_list_store_set (_tmp111_, &_tmp112_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
+ gtk_list_store_set (_tmp115_, &_tmp116_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp113_ = self->priv->settings;
+ _tmp117_ = self->priv->settings;
#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp114_ = g_settings_get_int (_tmp113_, "text-dpi");
+ _tmp118_ = g_settings_get_int (_tmp117_, "text-dpi");
#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- dpi = _tmp114_;
+ dpi = _tmp118_;
#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp115_ = dpi;
+ _tmp119_ = dpi;
#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- if (_tmp115_ <= 0) {
+ if (_tmp119_ <= 0) {
#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 8548 "ui.c"
+#line 8576 "ui.c"
}
#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp116_ = self->priv->text_dpi_combo;
+ _tmp120_ = self->priv->text_dpi_combo;
#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp117_ = dpi;
+ _tmp121_ = dpi;
#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_dpi_combo (self, _tmp116_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp117_);
+ user_interface_set_dpi_combo (self, _tmp120_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp121_);
#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp118_ = self->priv->text_dpi_combo;
+ _tmp122_ = self->priv->text_dpi_combo;
#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp118_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (_tmp122_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp119_ = self->priv->settings;
+ _tmp123_ = self->priv->settings;
#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp120_ = g_settings_get_int (_tmp119_, "photo-dpi");
+ _tmp124_ = g_settings_get_int (_tmp123_, "photo-dpi");
#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- dpi = _tmp120_;
+ dpi = _tmp124_;
#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp121_ = dpi;
+ _tmp125_ = dpi;
#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- if (_tmp121_ <= 0) {
+ if (_tmp125_ <= 0) {
#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 8572 "ui.c"
+#line 8600 "ui.c"
}
#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp122_ = self->priv->photo_dpi_combo;
+ _tmp126_ = self->priv->photo_dpi_combo;
#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp123_ = dpi;
+ _tmp127_ = dpi;
#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_dpi_combo (self, _tmp122_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp123_);
+ user_interface_set_dpi_combo (self, _tmp126_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp127_);
#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp124_ = self->priv->photo_dpi_combo;
+ _tmp128_ = self->priv->photo_dpi_combo;
#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp124_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (_tmp128_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp125_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+ _tmp129_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp125_);
+ g_object_ref_sink (_tmp129_);
#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- renderer = _tmp125_;
+ renderer = _tmp129_;
#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp126_ = self->priv->device_combo;
+ _tmp130_ = self->priv->device_combo;
#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp127_ = renderer;
+ _tmp131_ = renderer;
#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp126_, (GtkCellRenderer*) _tmp127_, TRUE);
+ gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, TRUE);
#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp128_ = self->priv->device_combo;
+ _tmp132_ = self->priv->device_combo;
#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp129_ = renderer;
+ _tmp133_ = renderer;
#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp128_, (GtkCellRenderer*) _tmp129_, "text", 1);
+ gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp132_, (GtkCellRenderer*) _tmp133_, "text", 1);
#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp130_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+ _tmp134_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp130_);
+ g_object_ref_sink (_tmp134_);
#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"
- renderer = _tmp130_;
+ renderer = _tmp134_;
#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp131_ = self->priv->page_side_combo;
+ _tmp135_ = self->priv->page_side_combo;
#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp132_ = renderer;
+ _tmp136_ = renderer;
#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp131_, (GtkCellRenderer*) _tmp132_, TRUE);
+ gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp135_, (GtkCellRenderer*) _tmp136_, TRUE);
#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp133_ = self->priv->page_side_combo;
+ _tmp137_ = self->priv->page_side_combo;
#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp134_ = renderer;
+ _tmp138_ = renderer;
#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp133_, (GtkCellRenderer*) _tmp134_, "text", 1);
+ gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp137_, (GtkCellRenderer*) _tmp138_, "text", 1);
#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp135_ = self->priv->settings;
+ _tmp139_ = self->priv->settings;
#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp136_ = g_settings_get_enum (_tmp135_, "page-side");
+ _tmp140_ = g_settings_get_enum (_tmp139_, "page-side");
#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_page_side (self, (ScanType) _tmp136_);
+ user_interface_set_page_side (self, (ScanType) _tmp140_);
#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp137_ = self->priv->page_side_combo;
+ _tmp141_ = self->priv->page_side_combo;
#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp137_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (_tmp141_, "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 ();
+ _tmp142_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp138_);
+ g_object_ref_sink (_tmp142_);
#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_;
+ renderer = _tmp142_;
#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp139_ = self->priv->paper_size_combo;
+ _tmp143_ = self->priv->paper_size_combo;
#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp140_ = renderer;
+ _tmp144_ = renderer;
#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
+ gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp143_, (GtkCellRenderer*) _tmp144_, TRUE);
#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp141_ = self->priv->paper_size_combo;
+ _tmp145_ = self->priv->paper_size_combo;
#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp142_ = renderer;
+ _tmp146_ = renderer;
#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 2);
+ gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp145_, (GtkCellRenderer*) _tmp146_, "text", 2);
#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp143_ = self->priv->settings;
+ _tmp147_ = self->priv->settings;
#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp144_ = g_settings_get_int (_tmp143_, "paper-width");
+ _tmp148_ = g_settings_get_int (_tmp147_, "paper-width");
#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- paper_width = _tmp144_;
+ paper_width = _tmp148_;
#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp145_ = self->priv->settings;
+ _tmp149_ = self->priv->settings;
#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp146_ = g_settings_get_int (_tmp145_, "paper-height");
+ _tmp150_ = g_settings_get_int (_tmp149_, "paper-height");
#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- paper_height = _tmp146_;
+ paper_height = _tmp150_;
#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp147_ = paper_width;
+ _tmp151_ = paper_width;
#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp148_ = paper_height;
+ _tmp152_ = paper_height;
#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_paper_size (self, _tmp147_, _tmp148_);
+ user_interface_set_paper_size (self, _tmp151_, _tmp152_);
#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp149_ = self->priv->paper_size_combo;
+ _tmp153_ = self->priv->paper_size_combo;
#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp149_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
+ g_signal_connect_object (_tmp153_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp150_ = self->priv->brightness_adjustment;
+ _tmp154_ = self->priv->brightness_adjustment;
#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp151_ = gtk_adjustment_get_lower (_tmp150_);
+ _tmp155_ = gtk_adjustment_get_lower (_tmp154_);
#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp152_ = _tmp151_;
+ _tmp156_ = _tmp155_;
#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- lower = _tmp152_;
+ lower = _tmp156_;
#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp153_ = _ ("Darker");
+ _tmp157_ = _ ("Darker");
#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp154_ = g_strdup_printf ("<small>%s</small>", _tmp153_);
+ _tmp158_ = g_strdup_printf ("<small>%s</small>", _tmp157_);
#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- darker_label = _tmp154_;
+ darker_label = _tmp158_;
#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp155_ = self->priv->brightness_adjustment;
+ _tmp159_ = self->priv->brightness_adjustment;
#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp156_ = gtk_adjustment_get_upper (_tmp155_);
+ _tmp160_ = gtk_adjustment_get_upper (_tmp159_);
#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp157_ = _tmp156_;
+ _tmp161_ = _tmp160_;
#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- upper = _tmp157_;
+ upper = _tmp161_;
#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp158_ = _ ("Lighter");
+ _tmp162_ = _ ("Lighter");
#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp159_ = g_strdup_printf ("<small>%s</small>", _tmp158_);
+ _tmp163_ = g_strdup_printf ("<small>%s</small>", _tmp162_);
#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- lighter_label = _tmp159_;
+ lighter_label = _tmp163_;
#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp160_ = self->priv->brightness_scale;
+ _tmp164_ = self->priv->brightness_scale;
#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp161_ = lower;
+ _tmp165_ = lower;
#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp162_ = darker_label;
+ _tmp166_ = darker_label;
#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp160_, _tmp161_, GTK_POS_BOTTOM, _tmp162_);
+ gtk_scale_add_mark (_tmp164_, _tmp165_, GTK_POS_BOTTOM, _tmp166_);
#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp163_ = self->priv->brightness_scale;
+ _tmp167_ = 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);
+ gtk_scale_add_mark (_tmp167_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp164_ = self->priv->brightness_scale;
+ _tmp168_ = self->priv->brightness_scale;
#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp165_ = upper;
+ _tmp169_ = upper;
#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp166_ = lighter_label;
+ _tmp170_ = lighter_label;
#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp164_, _tmp165_, GTK_POS_BOTTOM, _tmp166_);
+ gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp167_ = self->priv->settings;
+ _tmp171_ = self->priv->settings;
#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp168_ = g_settings_get_int (_tmp167_, "brightness");
+ _tmp172_ = g_settings_get_int (_tmp171_, "brightness");
#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_brightness (self, _tmp168_);
+ user_interface_set_brightness (self, _tmp172_);
#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp169_ = self->priv->brightness_adjustment;
+ _tmp173_ = 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);
+ g_signal_connect_object (_tmp173_, "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;
+ _tmp174_ = self->priv->contrast_adjustment;
#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp171_ = gtk_adjustment_get_lower (_tmp170_);
+ _tmp175_ = gtk_adjustment_get_lower (_tmp174_);
#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp172_ = _tmp171_;
+ _tmp176_ = _tmp175_;
#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- lower = _tmp172_;
+ lower = _tmp176_;
#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp173_ = _ ("Less");
+ _tmp177_ = _ ("Less");
#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp174_ = g_strdup_printf ("<small>%s</small>", _tmp173_);
+ _tmp178_ = g_strdup_printf ("<small>%s</small>", _tmp177_);
#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- less_label = _tmp174_;
+ less_label = _tmp178_;
#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp175_ = self->priv->contrast_adjustment;
+ _tmp179_ = self->priv->contrast_adjustment;
#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp176_ = gtk_adjustment_get_upper (_tmp175_);
+ _tmp180_ = gtk_adjustment_get_upper (_tmp179_);
#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp177_ = _tmp176_;
+ _tmp181_ = _tmp180_;
#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- upper = _tmp177_;
+ upper = _tmp181_;
#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp178_ = _ ("More");
+ _tmp182_ = _ ("More");
#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp179_ = g_strdup_printf ("<small>%s</small>", _tmp178_);
+ _tmp183_ = g_strdup_printf ("<small>%s</small>", _tmp182_);
#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- more_label = _tmp179_;
+ more_label = _tmp183_;
#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp180_ = self->priv->contrast_scale;
+ _tmp184_ = self->priv->contrast_scale;
#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp181_ = lower;
+ _tmp185_ = lower;
#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp182_ = less_label;
+ _tmp186_ = less_label;
#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp180_, _tmp181_, GTK_POS_BOTTOM, _tmp182_);
+ gtk_scale_add_mark (_tmp184_, _tmp185_, GTK_POS_BOTTOM, _tmp186_);
#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp183_ = self->priv->contrast_scale;
+ _tmp187_ = self->priv->contrast_scale;
#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp183_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark (_tmp187_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp184_ = self->priv->contrast_scale;
+ _tmp188_ = self->priv->contrast_scale;
#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp185_ = upper;
+ _tmp189_ = upper;
#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp186_ = more_label;
+ _tmp190_ = more_label;
#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp184_, _tmp185_, GTK_POS_BOTTOM, _tmp186_);
+ gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp187_ = self->priv->settings;
+ _tmp191_ = self->priv->settings;
#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp188_ = g_settings_get_int (_tmp187_, "contrast");
+ _tmp192_ = g_settings_get_int (_tmp191_, "contrast");
#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_contrast (self, _tmp188_);
+ user_interface_set_contrast (self, _tmp192_);
#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp189_ = self->priv->contrast_adjustment;
+ _tmp193_ = self->priv->contrast_adjustment;
#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp189_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
+ g_signal_connect_object (_tmp193_, "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;
+ _tmp194_ = self->priv->quality_adjustment;
#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp191_ = gtk_adjustment_get_lower (_tmp190_);
+ _tmp195_ = gtk_adjustment_get_lower (_tmp194_);
#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp192_ = _tmp191_;
+ _tmp196_ = _tmp195_;
#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- lower = _tmp192_;
+ lower = _tmp196_;
#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp193_ = _ ("Minimum");
+ _tmp197_ = _ ("Minimum");
#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp194_ = g_strdup_printf ("<small>%s</small>", _tmp193_);
+ _tmp198_ = g_strdup_printf ("<small>%s</small>", _tmp197_);
#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- minimum_label = _tmp194_;
+ minimum_label = _tmp198_;
#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp195_ = self->priv->quality_adjustment;
+ _tmp199_ = self->priv->quality_adjustment;
#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp196_ = gtk_adjustment_get_upper (_tmp195_);
+ _tmp200_ = gtk_adjustment_get_upper (_tmp199_);
#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp197_ = _tmp196_;
+ _tmp201_ = _tmp200_;
#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- upper = _tmp197_;
+ upper = _tmp201_;
#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp198_ = _ ("Maximum");
+ _tmp202_ = _ ("Maximum");
#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp199_ = g_strdup_printf ("<small>%s</small>", _tmp198_);
+ _tmp203_ = g_strdup_printf ("<small>%s</small>", _tmp202_);
#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- maximum_label = _tmp199_;
+ maximum_label = _tmp203_;
#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp200_ = self->priv->quality_scale;
+ _tmp204_ = self->priv->quality_scale;
#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp201_ = lower;
+ _tmp205_ = lower;
#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp202_ = minimum_label;
+ _tmp206_ = minimum_label;
#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp200_, _tmp201_, GTK_POS_BOTTOM, _tmp202_);
+ gtk_scale_add_mark (_tmp204_, _tmp205_, GTK_POS_BOTTOM, _tmp206_);
#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp203_ = self->priv->quality_scale;
+ _tmp207_ = self->priv->quality_scale;
#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp203_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
+ gtk_scale_add_mark (_tmp207_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp204_ = self->priv->quality_scale;
+ _tmp208_ = self->priv->quality_scale;
#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp205_ = upper;
+ _tmp209_ = upper;
#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp206_ = maximum_label;
+ _tmp210_ = maximum_label;
#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_scale_add_mark (_tmp204_, _tmp205_, GTK_POS_BOTTOM, _tmp206_);
+ gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp207_ = self->priv->settings;
+ _tmp211_ = self->priv->settings;
#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp208_ = g_settings_get_int (_tmp207_, "jpeg-quality");
+ _tmp212_ = g_settings_get_int (_tmp211_, "jpeg-quality");
#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_quality (self, _tmp208_);
+ user_interface_set_quality (self, _tmp212_);
#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp209_ = self->priv->quality_adjustment;
+ _tmp213_ = self->priv->quality_adjustment;
#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp209_, "value-changed", (GCallback) ___lambda17__gtk_adjustment_value_changed, self, 0);
+ g_signal_connect_object (_tmp213_, "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;
+ _tmp214_ = self->priv->settings;
#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp211_ = g_settings_get_string (_tmp210_, "selected-device");
+ _tmp215_ = g_settings_get_string (_tmp214_, "selected-device");
#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- device = _tmp211_;
+ device = _tmp215_;
#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp212_ = device;
+ _tmp216_ = device;
#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- if (_tmp212_ != NULL) {
-#line 8858 "ui.c"
- const gchar* _tmp213_ = NULL;
- GtkTreeIter _tmp214_ = {0};
- gboolean _tmp215_ = FALSE;
+ if (_tmp216_ != NULL) {
+#line 8886 "ui.c"
+ const gchar* _tmp217_ = NULL;
+ GtkTreeIter _tmp218_ = {0};
+ gboolean _tmp219_ = FALSE;
#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp213_ = device;
+ _tmp217_ = device;
#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp215_ = user_interface_find_scan_device (self, _tmp213_, &_tmp214_);
+ _tmp219_ = user_interface_find_scan_device (self, _tmp217_, &_tmp218_);
#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- iter = _tmp214_;
+ iter = _tmp218_;
#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- if (_tmp215_) {
-#line 8870 "ui.c"
- GtkComboBox* _tmp216_ = NULL;
- GtkTreeIter _tmp217_ = {0};
+ if (_tmp219_) {
+#line 8898 "ui.c"
+ GtkComboBox* _tmp220_ = NULL;
+ GtkTreeIter _tmp221_ = {0};
#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp216_ = self->priv->device_combo;
+ _tmp220_ = self->priv->device_combo;
#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp217_ = iter;
+ _tmp221_ = iter;
#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_combo_box_set_active_iter (_tmp216_, &_tmp217_);
-#line 8879 "ui.c"
+ gtk_combo_box_set_active_iter (_tmp220_, &_tmp221_);
+#line 8907 "ui.c"
}
}
#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp218_ = self->priv->settings;
+ _tmp222_ = self->priv->settings;
#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp219_ = g_settings_get_string (_tmp218_, "document-type");
+ _tmp223_ = g_settings_get_string (_tmp222_, "document-type");
#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- document_type = _tmp219_;
+ document_type = _tmp223_;
#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp220_ = document_type;
+ _tmp224_ = document_type;
#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- if (_tmp220_ != NULL) {
-#line 8892 "ui.c"
- const gchar* _tmp221_ = NULL;
+ if (_tmp224_ != NULL) {
+#line 8920 "ui.c"
+ const gchar* _tmp225_ = NULL;
#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp221_ = document_type;
+ _tmp225_ = document_type;
#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- user_interface_set_document_hint (self, _tmp221_, FALSE);
-#line 8898 "ui.c"
+ user_interface_set_document_hint (self, _tmp225_, FALSE);
+#line 8926 "ui.c"
}
#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp222_ = self->priv->_book;
+ _tmp226_ = self->priv->_book;
#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp223_ = book_view_new (_tmp222_);
+ _tmp227_ = book_view_new (_tmp226_);
#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp223_);
+ g_object_ref_sink (_tmp227_);
#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"
- self->priv->book_view = _tmp223_;
+ self->priv->book_view = _tmp227_;
#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp224_ = self->priv->book_view;
+ _tmp228_ = self->priv->book_view;
#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_container_set_border_width ((GtkContainer*) _tmp224_, (guint) 18);
+ gtk_container_set_border_width ((GtkContainer*) _tmp228_, (guint) 18);
#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp225_ = self->priv->main_vbox;
+ _tmp229_ = self->priv->main_vbox;
#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp226_ = self->priv->book_view;
+ _tmp230_ = 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);
+ gtk_box_pack_end (_tmp229_, (GtkWidget*) _tmp230_, TRUE, TRUE, (guint) 0);
#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp227_ = self->priv->book_view;
+ _tmp231_ = self->priv->book_view;
#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp227_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
+ g_signal_connect_object (_tmp231_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp228_ = self->priv->book_view;
+ _tmp232_ = self->priv->book_view;
#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_signal_connect_object (_tmp228_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
+ g_signal_connect_object (_tmp232_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp229_ = self->priv->book_view;
+ _tmp233_ = 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);
+ g_signal_connect_object (_tmp233_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp230_ = self->priv->book_view;
+ _tmp234_ = self->priv->book_view;
#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_widget_set_visible ((GtkWidget*) _tmp230_, TRUE);
+ gtk_widget_set_visible ((GtkWidget*) _tmp234_, TRUE);
#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp231_ = self->priv->authorize_dialog;
+ _tmp235_ = self->priv->authorize_dialog;
#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
+ gtk_window_set_transient_for ((GtkWindow*) _tmp235_, (GtkWindow*) self);
#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp232_ = self->priv->preferences_dialog;
+ _tmp236_ = self->priv->preferences_dialog;
#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_window_set_transient_for ((GtkWindow*) _tmp232_, (GtkWindow*) self);
+ gtk_window_set_transient_for ((GtkWindow*) _tmp236_, (GtkWindow*) self);
#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
user_interface_load_state (self);
#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp233_ = self->priv->window_width;
+ _tmp237_ = self->priv->window_width;
#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp234_ = self->priv->window_height;
+ _tmp238_ = self->priv->window_height;
#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_debug ("ui.vala:1848: Restoring window to %dx%d pixels", _tmp233_, _tmp234_);
+ g_debug ("ui.vala:1848: Restoring window to %dx%d pixels", _tmp237_, _tmp238_);
#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp235_ = self->priv->window_width;
+ _tmp239_ = self->priv->window_width;
#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp236_ = self->priv->window_height;
+ _tmp240_ = self->priv->window_height;
#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- gtk_window_set_default_size ((GtkWindow*) self, _tmp235_, _tmp236_);
+ gtk_window_set_default_size ((GtkWindow*) self, _tmp239_, _tmp240_);
#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp237_ = self->priv->window_is_maximized;
+ _tmp241_ = self->priv->window_is_maximized;
#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- if (_tmp237_) {
+ if (_tmp241_) {
#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_debug ("ui.vala:1852: Restoring window to maximized");
#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
gtk_window_maximize ((GtkWindow*) self);
-#line 8966 "ui.c"
+#line 8994 "ui.c"
}
#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp238_ = _ ("Saving document...");
+ _tmp242_ = _ ("Saving document...");
#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp239_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp238_);
+ _tmp243_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp242_);
#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- g_object_ref_sink (_tmp239_);
+ g_object_ref_sink (_tmp243_);
#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_object_unref0 (self->priv->progress_dialog);
#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- self->priv->progress_dialog = _tmp239_;
+ self->priv->progress_dialog = _tmp243_;
#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
- _tmp240_ = self->priv->_book;
+ _tmp244_ = 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);
+ g_signal_connect_object (_tmp244_, "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 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9013,7 +9041,7 @@ static void user_interface_load (UserInterface* self) {
_g_object_unref0 (hbox);
#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_object_unref0 (app);
-#line 9006 "ui.c"
+#line 9034 "ui.c"
}
@@ -9046,13 +9074,13 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
_g_free0 (desktop_name_list);
#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9039 "ui.c"
+#line 9067 "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"
+#line 9073 "ui.c"
{
gchar** n_collection = NULL;
gint n_collection_length1 = 0;
@@ -9064,14 +9092,14 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
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"
+#line 9085 "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"
+#line 9092 "ui.c"
{
const gchar* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
@@ -9091,16 +9119,16 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
_g_free0 (desktop_name_list);
#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9084 "ui.c"
+#line 9112 "ui.c"
}
#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_free0 (n);
-#line 9088 "ui.c"
+#line 9116 "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 9121 "ui.c"
}
#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
result = FALSE;
@@ -9108,7 +9136,7 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
_g_free0 (desktop_name_list);
#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9101 "ui.c"
+#line 9129 "ui.c"
}
@@ -9142,7 +9170,7 @@ static void user_interface_load_state (UserInterface* self) {
static GQuark _tmp28_label1 = 0;
#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
static GQuark _tmp28_label2 = 0;
-#line 9135 "ui.c"
+#line 9163 "ui.c"
GError * _inner_error_ = NULL;
#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_return_if_fail (self != NULL);
@@ -9160,7 +9188,7 @@ static void user_interface_load_state (UserInterface* self) {
_tmp3_ = g_key_file_new ();
#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
f = _tmp3_;
-#line 9153 "ui.c"
+#line 9181 "ui.c"
{
GKeyFile* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -9180,7 +9208,7 @@ static void user_interface_load_state (UserInterface* self) {
_g_free0 (_tmp7_);
#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9173 "ui.c"
+#line 9201 "ui.c"
goto __catch21_g_error;
}
}
@@ -9197,7 +9225,7 @@ static void user_interface_load_state (UserInterface* self) {
_tmp8_ = e;
#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 9190 "ui.c"
+#line 9218 "ui.c"
GError* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9206,11 +9234,11 @@ static void user_interface_load_state (UserInterface* self) {
_tmp10_ = _tmp9_->message;
#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 9227 "ui.c"
}
#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_error_free0 (e);
-#line 9203 "ui.c"
+#line 9231 "ui.c"
}
__finally21:
#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9223,7 +9251,7 @@ static void user_interface_load_state (UserInterface* self) {
g_clear_error (&_inner_error_);
#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return;
-#line 9216 "ui.c"
+#line 9244 "ui.c"
}
#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp11_ = f;
@@ -9237,7 +9265,7 @@ static void user_interface_load_state (UserInterface* self) {
if (_tmp13_ <= 0) {
#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv->window_width = 600;
-#line 9230 "ui.c"
+#line 9258 "ui.c"
}
#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp14_ = f;
@@ -9251,7 +9279,7 @@ static void user_interface_load_state (UserInterface* self) {
if (_tmp16_ <= 0) {
#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv->window_height = 400;
-#line 9244 "ui.c"
+#line 9272 "ui.c"
}
#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp17_ = f;
@@ -9291,59 +9319,59 @@ static void user_interface_load_state (UserInterface* self) {
if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
switch (0) {
-#line 9284 "ui.c"
+#line 9312 "ui.c"
default:
{
#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9291 "ui.c"
+#line 9319 "ui.c"
}
}
} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
switch (0) {
-#line 9297 "ui.c"
+#line 9325 "ui.c"
default:
{
#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9304 "ui.c"
+#line 9332 "ui.c"
}
}
} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
switch (0) {
-#line 9310 "ui.c"
+#line 9338 "ui.c"
default:
{
#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9317 "ui.c"
+#line 9345 "ui.c"
}
}
} else {
#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
switch (0) {
-#line 9323 "ui.c"
+#line 9351 "ui.c"
default:
{
#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9330 "ui.c"
+#line 9358 "ui.c"
}
}
}
#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_key_file_unref0 (f);
-#line 9336 "ui.c"
+#line 9364 "ui.c"
}
@@ -9358,7 +9386,7 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
g_return_val_if_fail (group_name != NULL, 0);
#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_return_val_if_fail (key != NULL, 0);
-#line 9351 "ui.c"
+#line 9379 "ui.c"
{
gint _tmp0_ = 0;
GKeyFile* _tmp1_ = NULL;
@@ -9377,14 +9405,14 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
_tmp0_ = _tmp4_;
#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9370 "ui.c"
+#line 9398 "ui.c"
goto __catch22_g_error;
}
#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
result = _tmp0_;
#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9377 "ui.c"
+#line 9405 "ui.c"
}
goto __finally22;
__catch22_g_error:
@@ -9400,7 +9428,7 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
result = _tmp5_;
#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9393 "ui.c"
+#line 9421 "ui.c"
}
__finally22:
#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9409,7 +9437,7 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
g_clear_error (&_inner_error_);
#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return 0;
-#line 9402 "ui.c"
+#line 9430 "ui.c"
}
@@ -9424,7 +9452,7 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
g_return_val_if_fail (group_name != NULL, FALSE);
#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_return_val_if_fail (key != NULL, FALSE);
-#line 9417 "ui.c"
+#line 9445 "ui.c"
{
gboolean _tmp0_ = FALSE;
GKeyFile* _tmp1_ = NULL;
@@ -9443,14 +9471,14 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
_tmp0_ = _tmp4_;
#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9436 "ui.c"
+#line 9464 "ui.c"
goto __catch23_g_error;
}
#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
result = _tmp0_;
#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9443 "ui.c"
+#line 9471 "ui.c"
}
goto __finally23;
__catch23_g_error:
@@ -9466,7 +9494,7 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
result = _tmp5_;
#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9459 "ui.c"
+#line 9487 "ui.c"
}
__finally23:
#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9475,7 +9503,7 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
g_clear_error (&_inner_error_);
#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return FALSE;
-#line 9468 "ui.c"
+#line 9496 "ui.c"
}
@@ -9492,7 +9520,7 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
g_return_val_if_fail (key != NULL, NULL);
#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_return_val_if_fail (_default_ != NULL, NULL);
-#line 9485 "ui.c"
+#line 9513 "ui.c"
{
gchar* _tmp0_ = NULL;
GKeyFile* _tmp1_ = NULL;
@@ -9512,7 +9540,7 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
_tmp0_ = _tmp4_;
#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9505 "ui.c"
+#line 9533 "ui.c"
goto __catch24_g_error;
}
#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9525,7 +9553,7 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
_g_free0 (_tmp0_);
#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9518 "ui.c"
+#line 9546 "ui.c"
}
goto __finally24;
__catch24_g_error:
@@ -9544,7 +9572,7 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
result = _tmp7_;
#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9537 "ui.c"
+#line 9565 "ui.c"
}
__finally24:
#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9553,7 +9581,7 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
g_clear_error (&_inner_error_);
#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return NULL;
-#line 9546 "ui.c"
+#line 9574 "ui.c"
}
@@ -9567,7 +9595,7 @@ static gboolean ___lambda10_ (UserInterface* self) {
result = FALSE;
#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9560 "ui.c"
+#line 9588 "ui.c"
}
@@ -9576,7 +9604,7 @@ static gboolean ____lambda10__gsource_func (gpointer self) {
result = ___lambda10_ ((UserInterface*) self);
#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9569 "ui.c"
+#line 9597 "ui.c"
}
@@ -9607,20 +9635,20 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
_tmp0_ = force;
#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (!_tmp0_) {
-#line 9600 "ui.c"
+#line 9628 "ui.c"
guint _tmp1_ = 0U;
guint _tmp3_ = 0U;
#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp1_ = self->priv->save_state_timeout;
#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (_tmp1_ != ((guint) 0)) {
-#line 9607 "ui.c"
+#line 9635 "ui.c"
guint _tmp2_ = 0U;
#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp2_ = self->priv->save_state_timeout;
#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_source_remove (_tmp2_);
-#line 9613 "ui.c"
+#line 9641 "ui.c"
}
#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);
@@ -9628,7 +9656,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
self->priv->save_state_timeout = _tmp3_;
#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return;
-#line 9621 "ui.c"
+#line 9649 "ui.c"
}
#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp4_ = user_interface_get_state_filename (self);
@@ -9686,7 +9714,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
switch (_tmp20_) {
#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 9679 "ui.c"
+#line 9707 "ui.c"
{
GKeyFile* _tmp21_ = NULL;
#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9695,11 +9723,11 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9688 "ui.c"
+#line 9716 "ui.c"
}
#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 9692 "ui.c"
+#line 9720 "ui.c"
{
GKeyFile* _tmp22_ = NULL;
#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9708,11 +9736,11 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9701 "ui.c"
+#line 9729 "ui.c"
}
#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 9705 "ui.c"
+#line 9733 "ui.c"
{
GKeyFile* _tmp23_ = NULL;
#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9721,11 +9749,11 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9714 "ui.c"
+#line 9742 "ui.c"
}
#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 9718 "ui.c"
+#line 9746 "ui.c"
{
GKeyFile* _tmp24_ = NULL;
#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9734,12 +9762,12 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9727 "ui.c"
+#line 9755 "ui.c"
}
default:
#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9732 "ui.c"
+#line 9760 "ui.c"
}
{
gchar* _tmp25_ = NULL;
@@ -9768,7 +9796,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
_g_free0 (_tmp27_);
#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9761 "ui.c"
+#line 9789 "ui.c"
goto __catch25_g_error;
}
}
@@ -9790,7 +9818,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
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 9783 "ui.c"
+#line 9811 "ui.c"
}
__finally25:
#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -9803,11 +9831,11 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
g_clear_error (&_inner_error_);
#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return;
-#line 9796 "ui.c"
+#line 9824 "ui.c"
}
#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_key_file_unref0 (f);
-#line 9800 "ui.c"
+#line 9828 "ui.c"
}
@@ -9822,7 +9850,7 @@ static gboolean ___lambda18_ (UserInterface* self) {
result = FALSE;
#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9815 "ui.c"
+#line 9843 "ui.c"
}
@@ -9831,7 +9859,7 @@ static gboolean ____lambda18__gsource_func (gpointer self) {
result = ___lambda18_ ((UserInterface*) self);
#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 9824 "ui.c"
+#line 9852 "ui.c"
}
@@ -9858,7 +9886,7 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
g_return_if_fail (self != NULL);
#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
while (TRUE) {
-#line 9851 "ui.c"
+#line 9879 "ui.c"
gboolean _tmp0_ = FALSE;
#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp0_ = gtk_events_pending ();
@@ -9866,11 +9894,11 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
if (!_tmp0_) {
#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 9859 "ui.c"
+#line 9887 "ui.c"
}
#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
gtk_main_iteration ();
-#line 9863 "ui.c"
+#line 9891 "ui.c"
}
#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp1_ = self->priv->_book;
@@ -9896,7 +9924,7 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
if (_tmp7_) {
#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 9917 "ui.c"
}
#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp8_ = _ ("Saving page %d out of %d");
@@ -9920,7 +9948,7 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
progress_bar_dialog_set_message (_tmp14_, message);
#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_g_free0 (message);
-#line 9913 "ui.c"
+#line 9941 "ui.c"
}
@@ -9932,7 +9960,7 @@ void user_interface_show_progress_dialog (UserInterface* self) {
_tmp0_ = self->priv->progress_dialog;
#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 9925 "ui.c"
+#line 9953 "ui.c"
}
@@ -9944,7 +9972,7 @@ void user_interface_hide_progress_dialog (UserInterface* self) {
_tmp0_ = self->priv->progress_dialog;
#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 9937 "ui.c"
+#line 9965 "ui.c"
}
@@ -9984,7 +10012,7 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
self->priv->error_change_scanner_hint = _tmp4_;
#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
user_interface_update_info_bar (self);
-#line 9977 "ui.c"
+#line 10005 "ui.c"
}
@@ -9993,7 +10021,7 @@ void user_interface_start (UserInterface* self) {
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 9986 "ui.c"
+#line 10014 "ui.c"
}
@@ -10008,14 +10036,14 @@ Book* user_interface_get_book (UserInterface* self) {
result = _tmp0_;
#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 10001 "ui.c"
+#line 10029 "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 10008 "ui.c"
+#line 10036 "ui.c"
}
@@ -10034,7 +10062,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 10027 "ui.c"
+#line 10055 "ui.c"
}
@@ -10055,7 +10083,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 10048 "ui.c"
+#line 10076 "ui.c"
}
@@ -10072,7 +10100,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 10065 "ui.c"
+#line 10093 "ui.c"
}
@@ -10087,7 +10115,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 10080 "ui.c"
+#line 10108 "ui.c"
}
@@ -10106,7 +10134,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 10099 "ui.c"
+#line 10127 "ui.c"
}
@@ -10121,7 +10149,7 @@ gboolean user_interface_get_scanning (UserInterface* self) {
result = _tmp0_;
#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 10114 "ui.c"
+#line 10142 "ui.c"
}
@@ -10175,7 +10203,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 10168 "ui.c"
+#line 10196 "ui.c"
}
@@ -10196,7 +10224,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 10189 "ui.c"
+#line 10217 "ui.c"
}
@@ -10213,7 +10241,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 10206 "ui.c"
+#line 10234 "ui.c"
}
@@ -10234,7 +10262,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 10227 "ui.c"
+#line 10255 "ui.c"
}
@@ -10251,7 +10279,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 10244 "ui.c"
+#line 10272 "ui.c"
}
@@ -10272,7 +10300,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 10265 "ui.c"
+#line 10293 "ui.c"
}
@@ -10289,7 +10317,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 10282 "ui.c"
+#line 10310 "ui.c"
}
@@ -10309,7 +10337,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 10302 "ui.c"
+#line 10330 "ui.c"
gchar* device = NULL;
GtkListStore* _tmp3_ = NULL;
GtkTreeIter _tmp4_ = {0};
@@ -10323,13 +10351,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 10316 "ui.c"
+#line 10344 "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 10322 "ui.c"
+#line 10350 "ui.c"
}
@@ -10352,7 +10380,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 10345 "ui.c"
+#line 10373 "ui.c"
}
#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp3_ = self->priv->device_combo;
@@ -10364,7 +10392,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 10357 "ui.c"
+#line 10385 "ui.c"
}
@@ -10382,7 +10410,7 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
result = _tmp1_;
#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 10375 "ui.c"
+#line 10403 "ui.c"
}
@@ -10401,19 +10429,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 10394 "ui.c"
+#line 10422 "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 10400 "ui.c"
+#line 10428 "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 10406 "ui.c"
+#line 10434 "ui.c"
}
@@ -10432,19 +10460,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 10425 "ui.c"
+#line 10453 "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 10431 "ui.c"
+#line 10459 "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 10437 "ui.c"
+#line 10465 "ui.c"
}
@@ -10670,7 +10698,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 10663 "ui.c"
+#line 10691 "ui.c"
}
@@ -10696,7 +10724,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 10689 "ui.c"
+#line 10717 "ui.c"
}
@@ -10870,7 +10898,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 10863 "ui.c"
+#line 10891 "ui.c"
}
@@ -10939,13 +10967,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 10932 "ui.c"
+#line 10960 "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 10938 "ui.c"
+#line 10966 "ui.c"
}
}
@@ -11003,13 +11031,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 10996 "ui.c"
+#line 11024 "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 11002 "ui.c"
+#line 11030 "ui.c"
}
}
@@ -11106,14 +11134,14 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
_g_object_unref0 (hbox);
#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return self;
-#line 11099 "ui.c"
+#line 11127 "ui.c"
}
ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 11106 "ui.c"
+#line 11134 "ui.c"
}
@@ -11134,7 +11162,7 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
result = _tmp2_;
#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 11127 "ui.c"
+#line 11155 "ui.c"
}
@@ -11151,7 +11179,7 @@ void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_object_notify ((GObject *) self, "fraction");
-#line 11144 "ui.c"
+#line 11172 "ui.c"
}
@@ -11172,7 +11200,7 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
result = _tmp2_;
#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 11165 "ui.c"
+#line 11193 "ui.c"
}
@@ -11189,7 +11217,7 @@ void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* valu
gtk_progress_bar_set_text (_tmp0_, _tmp1_);
#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
g_object_notify ((GObject *) self, "message");
-#line 11182 "ui.c"
+#line 11210 "ui.c"
}
@@ -11208,14 +11236,14 @@ static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
#line 2050 "/home/bob/bzr/simple-scan/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 11201 "ui.c"
+#line 11229 "ui.c"
}
static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 11208 "ui.c"
+#line 11236 "ui.c"
}
@@ -11227,7 +11255,7 @@ static void progress_bar_dialog_finalize (GObject* obj) {
_g_object_unref0 (self->priv->bar);
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 11220 "ui.c"
+#line 11248 "ui.c"
}
@@ -11260,13 +11288,13 @@ static void _vala_progress_bar_dialog_get_property (GObject * object, guint prop
g_value_set_string (value, progress_bar_dialog_get_message (self));
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 11253 "ui.c"
+#line 11281 "ui.c"
default:
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 11259 "ui.c"
+#line 11287 "ui.c"
}
}
@@ -11288,13 +11316,13 @@ static void _vala_progress_bar_dialog_set_property (GObject * object, guint prop
progress_bar_dialog_set_message (self, g_value_get_string (value));
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 11281 "ui.c"
+#line 11309 "ui.c"
default:
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
break;
-#line 11287 "ui.c"
+#line 11315 "ui.c"
}
}
@@ -11319,7 +11347,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
filename = _tmp2_;
-#line 11312 "ui.c"
+#line 11340 "ui.c"
{
gint fd = 0;
const gchar* _tmp3_ = NULL;
@@ -11338,14 +11366,14 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
fd = _tmp5_;
#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11331 "ui.c"
+#line 11359 "ui.c"
goto __catch26_g_error;
}
#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp6_ = fd;
#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
close (_tmp6_);
-#line 11338 "ui.c"
+#line 11366 "ui.c"
}
goto __finally26;
__catch26_g_error:
@@ -11373,7 +11401,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
_g_free0 (filename);
#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 11366 "ui.c"
+#line 11394 "ui.c"
}
__finally26:
#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -11388,7 +11416,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
g_clear_error (&_inner_error_);
#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return NULL;
-#line 11381 "ui.c"
+#line 11409 "ui.c"
}
#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
result = path;
@@ -11396,7 +11424,7 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
_g_free0 (filename);
#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 11389 "ui.c"
+#line 11417 "ui.c"
}
@@ -11433,14 +11461,14 @@ PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r,
self->priv->b = _tmp4_;
#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return self;
-#line 11426 "ui.c"
+#line 11454 "ui.c"
}
PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 11433 "ui.c"
+#line 11461 "ui.c"
}
@@ -11458,13 +11486,13 @@ static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_w
if (minimum_width) {
#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*minimum_width = _vala_minimum_width;
-#line 11451 "ui.c"
+#line 11479 "ui.c"
}
#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (natural_width) {
#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*natural_width = _vala_natural_width;
-#line 11457 "ui.c"
+#line 11485 "ui.c"
}
}
@@ -11486,13 +11514,13 @@ static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_
if (minimum_height) {
#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*minimum_height = _vala_minimum_height;
-#line 11479 "ui.c"
+#line 11507 "ui.c"
}
#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (natural_height) {
#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*natural_height = _vala_natural_height;
-#line 11485 "ui.c"
+#line 11513 "ui.c"
}
}
@@ -11514,13 +11542,13 @@ static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint
if (minimum_height) {
#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*minimum_height = _vala_minimum_height;
-#line 11507 "ui.c"
+#line 11535 "ui.c"
}
#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (natural_height) {
#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*natural_height = _vala_natural_height;
-#line 11513 "ui.c"
+#line 11541 "ui.c"
}
}
@@ -11542,13 +11570,13 @@ static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint
if (minimum_width) {
#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*minimum_width = _vala_minimum_width;
-#line 11535 "ui.c"
+#line 11563 "ui.c"
}
#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if (natural_width) {
#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
*natural_width = _vala_natural_width;
-#line 11541 "ui.c"
+#line 11569 "ui.c"
}
}
@@ -11609,7 +11637,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
_tmp3_ = h;
#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 11602 "ui.c"
+#line 11630 "ui.c"
gint _tmp4_ = 0;
gdouble _tmp5_ = 0.0;
#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
@@ -11618,7 +11646,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
_tmp5_ = round (_tmp4_ / G_SQRT2);
#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
w = (gint) _tmp5_;
-#line 11611 "ui.c"
+#line 11639 "ui.c"
} else {
gint _tmp6_ = 0;
gdouble _tmp7_ = 0.0;
@@ -11628,7 +11656,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
_tmp7_ = round (_tmp6_ * G_SQRT2);
#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
h = (gint) _tmp7_;
-#line 11621 "ui.c"
+#line 11649 "ui.c"
}
#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
_tmp8_ = c;
@@ -11710,7 +11738,7 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
result = TRUE;
#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
return result;
-#line 11703 "ui.c"
+#line 11731 "ui.c"
}
@@ -11731,14 +11759,14 @@ static void page_icon_class_init (PageIconClass * klass) {
((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 11724 "ui.c"
+#line 11752 "ui.c"
}
static void page_icon_instance_init (PageIcon * self) {
#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 11731 "ui.c"
+#line 11759 "ui.c"
}
@@ -11750,7 +11778,7 @@ static void page_icon_finalize (GObject* obj) {
_g_free0 (self->priv->text);
#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 11743 "ui.c"
+#line 11771 "ui.c"
}
diff --git a/src/ui.vala b/src/ui.vala
index c12b1cd..4ad6aa7 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1667,7 +1667,7 @@ public class UserInterface : Gtk.ApplicationWindow
var app = Application.get_default () as Gtk.Application;
- if (is_desktop ("Unity") || is_desktop ("XFCE"))
+ if (is_desktop ("Unity") || is_desktop ("XFCE") || is_desktop ("MATE") || is_desktop ("LXDE"))
{
set_titlebar (null);
menubar.visible = true;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:29:03 +0000